Skip to content
Snippets Groups Projects
Commit 2726ed87 authored by srosse's avatar srosse
Browse files

OO-3119: add missing security callback needed for the list of question pool items

parent 1b42cac6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 19 deletions
src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java
+ 6
− 6
View file @ 2726ed87
...@@ -113,14 +113,14 @@ public abstract class AbstractItemListController extends FormBasicController ...@@ -113,14 +113,14 @@ public abstract class AbstractItemListController extends FormBasicController
this(ureq, wControl, securityCallback, source, null, key, searchAllTaxonomyLevels); this(ureq, wControl, securityCallback, source, null, key, searchAllTaxonomyLevels);
} }
public AbstractItemListController(UserRequest ureq, WindowControl wControl, QuestionItemsSource source, public AbstractItemListController(UserRequest ureq, WindowControl wControl, QPoolSecurityCallback securityCallback,
String key) { QuestionItemsSource source, String key) {
this(ureq, wControl, null, source, null, key, false); this(ureq, wControl, securityCallback, source, null, key, false);
} }
public AbstractItemListController(UserRequest ureq, WindowControl wControl, QuestionItemsSource source, public AbstractItemListController(UserRequest ureq, WindowControl wControl, QPoolSecurityCallback securityCallback,
String restrictToFormat, String key) { QuestionItemsSource source, String restrictToFormat, String key) {
this(ureq, wControl, null, source, restrictToFormat, key, false); this(ureq, wControl, securityCallback, source, restrictToFormat, key, false);
} }
public AbstractItemListController(UserRequest ureq, WindowControl wControl, QPoolSecurityCallback securityCallback, public AbstractItemListController(UserRequest ureq, WindowControl wControl, QPoolSecurityCallback securityCallback,
......
src/main/java/org/olat/modules/qpool/ui/ItemListController.java
+ 3
− 2
View file @ 2726ed87
...@@ -29,6 +29,7 @@ import org.olat.core.gui.components.form.flexible.elements.FormLink; ...@@ -29,6 +29,7 @@ import org.olat.core.gui.components.form.flexible.elements.FormLink;
import org.olat.core.gui.components.form.flexible.impl.FormEvent; import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.link.Link; import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
import org.olat.modules.qpool.QPoolSecurityCallback;
import org.olat.modules.qpool.QuestionItemView; import org.olat.modules.qpool.QuestionItemView;
import org.olat.modules.qpool.ui.events.QItemViewEvent; import org.olat.modules.qpool.ui.events.QItemViewEvent;
...@@ -42,8 +43,8 @@ public class ItemListController extends AbstractItemListController { ...@@ -42,8 +43,8 @@ public class ItemListController extends AbstractItemListController {
private FormLink selectLink; private FormLink selectLink;
public ItemListController(UserRequest ureq, WindowControl wControl, QuestionItemsSource source) { public ItemListController(UserRequest ureq, WindowControl wControl, QPoolSecurityCallback secCallback, QuestionItemsSource source) {
super(ureq, wControl, source, "select"); super(ureq, wControl, secCallback, source, "select");
initForm(ureq); initForm(ureq);
} }
......
src/main/java/org/olat/modules/qpool/ui/ItemListMyCompetencesController.java
+ 3
− 2
View file @ 2726ed87
...@@ -31,6 +31,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormEvent; ...@@ -31,6 +31,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.link.Link; import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
import org.olat.modules.qpool.QPoolSecurityCallback;
import org.olat.modules.qpool.QuestionItemView; import org.olat.modules.qpool.QuestionItemView;
import org.olat.modules.qpool.ui.datasource.EmptyItemsSource; import org.olat.modules.qpool.ui.datasource.EmptyItemsSource;
import org.olat.modules.qpool.ui.datasource.FinalItemsSource; import org.olat.modules.qpool.ui.datasource.FinalItemsSource;
...@@ -54,8 +55,8 @@ public class ItemListMyCompetencesController extends AbstractItemListController ...@@ -54,8 +55,8 @@ public class ItemListMyCompetencesController extends AbstractItemListController
private QPoolTaxonomyTreeBuilder qpoolTaxonomyTreeBuilder; private QPoolTaxonomyTreeBuilder qpoolTaxonomyTreeBuilder;
public ItemListMyCompetencesController(UserRequest ureq, WindowControl wControl, String restrictToFormat) { public ItemListMyCompetencesController(UserRequest ureq, WindowControl wControl, QPoolSecurityCallback secCallback, String restrictToFormat) {
super(ureq, wControl, new EmptyItemsSource(), restrictToFormat, "select"); super(ureq, wControl, secCallback, new EmptyItemsSource(), restrictToFormat, "select");
} }
@Override @Override
......
src/main/java/org/olat/modules/qpool/ui/ItemListMyListsController.java
+ 3
− 2
View file @ 2726ed87
...@@ -31,6 +31,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormEvent; ...@@ -31,6 +31,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.link.Link; import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
import org.olat.modules.qpool.QPoolSecurityCallback;
import org.olat.modules.qpool.QuestionItemCollection; import org.olat.modules.qpool.QuestionItemCollection;
import org.olat.modules.qpool.QuestionItemView; import org.olat.modules.qpool.QuestionItemView;
import org.olat.modules.qpool.ui.datasource.CollectionOfItemsSource; import org.olat.modules.qpool.ui.datasource.CollectionOfItemsSource;
...@@ -50,8 +51,8 @@ public class ItemListMyListsController extends AbstractItemListController { ...@@ -50,8 +51,8 @@ public class ItemListMyListsController extends AbstractItemListController {
private List<QuestionItemCollection> myCollections; private List<QuestionItemCollection> myCollections;
public ItemListMyListsController(UserRequest ureq, WindowControl wControl, String restrictToFormat) { public ItemListMyListsController(UserRequest ureq, WindowControl wControl, QPoolSecurityCallback secCallback, String restrictToFormat) {
super(ureq, wControl, new EmptyItemsSource(), restrictToFormat, "select"); super(ureq, wControl, secCallback, new EmptyItemsSource(), restrictToFormat, "select");
} }
@Override @Override
......
src/main/java/org/olat/modules/qpool/ui/ItemListMySharesController.java
+ 3
− 2
View file @ 2726ed87
...@@ -33,6 +33,7 @@ import org.olat.core.gui.control.WindowControl; ...@@ -33,6 +33,7 @@ import org.olat.core.gui.control.WindowControl;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
import org.olat.group.BusinessGroup; import org.olat.group.BusinessGroup;
import org.olat.modules.qpool.Pool; import org.olat.modules.qpool.Pool;
import org.olat.modules.qpool.QPoolSecurityCallback;
import org.olat.modules.qpool.QuestionItemView; import org.olat.modules.qpool.QuestionItemView;
import org.olat.modules.qpool.ui.datasource.EmptyItemsSource; import org.olat.modules.qpool.ui.datasource.EmptyItemsSource;
import org.olat.modules.qpool.ui.datasource.PoolItemsSource; import org.olat.modules.qpool.ui.datasource.PoolItemsSource;
...@@ -53,8 +54,8 @@ public class ItemListMySharesController extends AbstractItemListController { ...@@ -53,8 +54,8 @@ public class ItemListMySharesController extends AbstractItemListController {
private List<Pool> myPools; private List<Pool> myPools;
private List<BusinessGroup> myGroups; private List<BusinessGroup> myGroups;
public ItemListMySharesController(UserRequest ureq, WindowControl wControl, String restrictToFormat) { public ItemListMySharesController(UserRequest ureq, WindowControl wControl, QPoolSecurityCallback secCallback, String restrictToFormat) {
super(ureq, wControl, new EmptyItemsSource(), restrictToFormat, "select"); super(ureq, wControl, secCallback, new EmptyItemsSource(), restrictToFormat, "select");
} }
@Override @Override
......
src/main/java/org/olat/modules/qpool/ui/SelectItemController.java
+ 15
− 5
View file @ 2726ed87
...@@ -32,7 +32,10 @@ import org.olat.core.gui.control.Event; ...@@ -32,7 +32,10 @@ import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.controller.BasicController; import org.olat.core.gui.control.controller.BasicController;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
import org.olat.core.util.UserSession;
import org.olat.modules.qpool.QPoolSecurityCallback;
import org.olat.modules.qpool.QuestionPoolModule; import org.olat.modules.qpool.QuestionPoolModule;
import org.olat.modules.qpool.security.QPoolSecurityCallbackFactory;
import org.olat.modules.qpool.ui.datasource.DefaultItemsSource; import org.olat.modules.qpool.ui.datasource.DefaultItemsSource;
import org.olat.modules.qpool.ui.datasource.MarkedItemsSource; import org.olat.modules.qpool.ui.datasource.MarkedItemsSource;
import org.olat.modules.qpool.ui.datasource.MyItemsSource; import org.olat.modules.qpool.ui.datasource.MyItemsSource;
...@@ -58,14 +61,21 @@ public class SelectItemController extends BasicController { ...@@ -58,14 +61,21 @@ public class SelectItemController extends BasicController {
private ItemListMyCompetencesController myCompetencesCtrl; private ItemListMyCompetencesController myCompetencesCtrl;
private String restrictToFormat; private String restrictToFormat;
private final QPoolSecurityCallback secCallback;
@Autowired @Autowired
private QuestionPoolModule qpoolModule; private QuestionPoolModule qpoolModule;
@Autowired
private QPoolSecurityCallbackFactory qPoolSecurityCallbackFactory;
public SelectItemController(UserRequest ureq, WindowControl wControl, String restrictToFormat) { public SelectItemController(UserRequest ureq, WindowControl wControl, String restrictToFormat) {
super(ureq, wControl); super(ureq, wControl);
this.restrictToFormat = restrictToFormat; this.restrictToFormat = restrictToFormat;
mainVC = createVelocityContainer("item_list_overview"); mainVC = createVelocityContainer("item_list_overview");
UserSession usess = ureq.getUserSession();
secCallback = qPoolSecurityCallbackFactory.createQPoolSecurityCallback(usess.getRoles());
int marked = updateMarkedItems(ureq); int marked = updateMarkedItems(ureq);
if(marked <= 0) { if(marked <= 0) {
updateOwnedGroups(ureq); updateOwnedGroups(ureq);
...@@ -129,7 +139,7 @@ public class SelectItemController extends BasicController { ...@@ -129,7 +139,7 @@ public class SelectItemController extends BasicController {
DefaultItemsSource source = new MarkedItemsSource(getIdentity(), ureq.getUserSession().getRoles(), "Fav"); DefaultItemsSource source = new MarkedItemsSource(getIdentity(), ureq.getUserSession().getRoles(), "Fav");
source.getDefaultParams().setFavoritOnly(true); source.getDefaultParams().setFavoritOnly(true);
source.getDefaultParams().setFormat(restrictToFormat); source.getDefaultParams().setFormat(restrictToFormat);
markedItemsCtrl = new ItemListController(ureq, getWindowControl(), source); markedItemsCtrl = new ItemListController(ureq, getWindowControl(), secCallback, source);
listenTo(markedItemsCtrl); listenTo(markedItemsCtrl);
} }
int numOfMarkedItems = markedItemsCtrl.updateList(); int numOfMarkedItems = markedItemsCtrl.updateList();
...@@ -142,7 +152,7 @@ public class SelectItemController extends BasicController { ...@@ -142,7 +152,7 @@ public class SelectItemController extends BasicController {
DefaultItemsSource source = new MyItemsSource(getIdentity(), ureq.getUserSession().getRoles(), "My"); DefaultItemsSource source = new MyItemsSource(getIdentity(), ureq.getUserSession().getRoles(), "My");
source.getDefaultParams().setAuthor(getIdentity()); source.getDefaultParams().setAuthor(getIdentity());
source.getDefaultParams().setFormat(restrictToFormat); source.getDefaultParams().setFormat(restrictToFormat);
ownedItemsCtrl = new ItemListController(ureq, getWindowControl(), source); ownedItemsCtrl = new ItemListController(ureq, getWindowControl(), secCallback, source);
listenTo(ownedItemsCtrl); listenTo(ownedItemsCtrl);
} }
ownedItemsCtrl.updateList(); ownedItemsCtrl.updateList();
...@@ -151,7 +161,7 @@ public class SelectItemController extends BasicController { ...@@ -151,7 +161,7 @@ public class SelectItemController extends BasicController {
private void updateMyLists(UserRequest ureq) { private void updateMyLists(UserRequest ureq) {
if(myListsCtrl == null) { if(myListsCtrl == null) {
myListsCtrl = new ItemListMyListsController(ureq, getWindowControl(), restrictToFormat); myListsCtrl = new ItemListMyListsController(ureq, getWindowControl(), secCallback, restrictToFormat);
listenTo(myListsCtrl); listenTo(myListsCtrl);
} }
mainVC.put("itemList", myListsCtrl.getInitialComponent()); mainVC.put("itemList", myListsCtrl.getInitialComponent());
...@@ -159,7 +169,7 @@ public class SelectItemController extends BasicController { ...@@ -159,7 +169,7 @@ public class SelectItemController extends BasicController {
private void updateMyShares(UserRequest ureq) { private void updateMyShares(UserRequest ureq) {
if(mySharesCtrl == null) { if(mySharesCtrl == null) {
mySharesCtrl = new ItemListMySharesController(ureq, getWindowControl(), restrictToFormat); mySharesCtrl = new ItemListMySharesController(ureq, getWindowControl(), secCallback, restrictToFormat);
listenTo(mySharesCtrl); listenTo(mySharesCtrl);
} }
mainVC.put("itemList", mySharesCtrl.getInitialComponent()); mainVC.put("itemList", mySharesCtrl.getInitialComponent());
...@@ -167,7 +177,7 @@ public class SelectItemController extends BasicController { ...@@ -167,7 +177,7 @@ public class SelectItemController extends BasicController {
private void updateMyCompetences(UserRequest ureq) { private void updateMyCompetences(UserRequest ureq) {
if(myCompetencesCtrl == null) { if(myCompetencesCtrl == null) {
myCompetencesCtrl = new ItemListMyCompetencesController(ureq, getWindowControl(), restrictToFormat); myCompetencesCtrl = new ItemListMyCompetencesController(ureq, getWindowControl(), secCallback, restrictToFormat);
listenTo(myCompetencesCtrl); listenTo(myCompetencesCtrl);
} }
mainVC.put("itemList", myCompetencesCtrl.getInitialComponent()); mainVC.put("itemList", myCompetencesCtrl.getInitialComponent());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment