OO-3116: Load the questions with the correct status when clicked on a my...

OO-3116: Load the questions with the correct status when clicked on a my taxonomy node, reload count when clicked a revewi node

src/main/java/org/olat/modules/qpool/ui/tree/AllQuestionsTreeNode.java

@@ -62,17 +62,17 @@ public class AllQuestionsTreeNode extends GenericTreeNode implements ControllerT
 	
 	@Override
 	public Controller getController(UserRequest ureq, WindowControl wControl) {
-		QuestionItemsSource source = new AllItemsSource(
-				ureq.getIdentity(),
-				ureq.getUserSession().getRoles(),
-				ALL); 
 		if(questionsCtrl == null) {
+			QuestionItemsSource source = new AllItemsSource(
+					ureq.getIdentity(),
+					ureq.getUserSession().getRoles(),
+					ALL); 
 			WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ORES, null,
 					wControl, true);
 			questionsCtrl = new QuestionsController(ureq, swControl, stackPanel, source, securityCallback,
 					ALL);
 		} else {
-			questionsCtrl.updateSource(source);
+			questionsCtrl.updateSource();
 		}
 		return questionsCtrl;
 	}

src/main/java/org/olat/modules/qpool/ui/tree/BusinessGroupTreeNode.java

@@ -70,19 +70,19 @@ public class BusinessGroupTreeNode extends GenericTreeNode implements Controller
 	
 	@Override
 	public Controller getController(UserRequest ureq, WindowControl wControl) {
-		boolean shareAdmin = isShareAdmin(ureq, group);
-		QuestionItemsSource source = new SharedItemsSource(
-				group,
-				ureq.getIdentity(),
-				ureq.getUserSession().getRoles(),
-				shareAdmin);
 		if(questionsCtrl == null) {
+			boolean shareAdmin = isShareAdmin(ureq, group);
+			QuestionItemsSource source = new SharedItemsSource(
+					group,
+					ureq.getIdentity(),
+					ureq.getUserSession().getRoles(),
+					shareAdmin);
 			WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, group, null,
 					wControl, true);
 			questionsCtrl = new QuestionsController(ureq, swControl, stackPanel, source, securityCallback,
 					TABLE_PREFERENCE_PREFIX + group.getKey());
 		} else {
-			questionsCtrl.updateSource(source);
+			questionsCtrl.updateSource();
 		}
 		return questionsCtrl;
 	}

src/main/java/org/olat/modules/qpool/ui/tree/FinalTreeNode.java

@@ -71,17 +71,17 @@ public class FinalTreeNode extends GenericTreeNode implements ControllerTreeNode
 
 	@Override
 	public Controller getController(UserRequest ureq, WindowControl wControl) {
-		QuestionItemsSource source = new FinalItemsSource(
-				ureq.getIdentity(),
-				ureq.getUserSession().getRoles(),
-				taxonomyLevel);
 		if (questionsCtrl == null) {
+			QuestionItemsSource source = new FinalItemsSource(
+					ureq.getIdentity(),
+					ureq.getUserSession().getRoles(),
+					taxonomyLevel);
 			OLATResourceable ores = OresHelper.createOLATResourceableInstance(FINAL + "_" + taxonomyLevel.getIdentifier(), taxonomyLevel.getKey());
 			WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ores, null, wControl, true);
 			questionsCtrl = new QuestionsController(ureq, swControl, stackPanel, source, securityCallback,
 					FINAL + taxonomyLevel.getKey());
 		} else {
-			questionsCtrl.updateSource(source);
+			questionsCtrl.updateSource();
 		}
 		return questionsCtrl;
 	}

src/main/java/org/olat/modules/qpool/ui/tree/MarkedQuestionsTreeNode.java

@@ -67,17 +67,17 @@ public class MarkedQuestionsTreeNode extends GenericTreeNode implements Controll
 	
 	@Override
 	public Controller getController(UserRequest ureq, WindowControl wControl) {
-		QuestionItemsSource source = new MarkedItemsSource(
-				ureq.getIdentity(),
-				ureq.getUserSession().getRoles(),
-				ITEM_SOURCE_NAME); 
 		if(questionsCtrl == null) {
+			QuestionItemsSource source = new MarkedItemsSource(
+					ureq.getIdentity(),
+					ureq.getUserSession().getRoles(),
+					ITEM_SOURCE_NAME); 
 			WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ORES, null,
 					wControl, true);
 			questionsCtrl = new QuestionsController(ureq, swControl, stackPanel, source, securityCallback,
 					TABLE_PREFERENCE_PREFIX);
 		} else {
-			questionsCtrl.updateSource(source);
+			questionsCtrl.updateSource();
 		}
 		return questionsCtrl;
 	}

src/main/java/org/olat/modules/qpool/ui/tree/MyQuestionsTreeNode.java

@@ -67,17 +67,17 @@ public class MyQuestionsTreeNode extends GenericTreeNode implements ControllerTr
 
 	@Override
 	public Controller getController(UserRequest ureq, WindowControl wControl) {
-		QuestionItemsSource source = new MyItemsSource(
-				ureq.getIdentity(),
-				ureq.getUserSession().getRoles(),
-				ITEM_SOURCE_NAME);
 		if(questionsCtrl == null) {
+			QuestionItemsSource source = new MyItemsSource(
+					ureq.getIdentity(),
+					ureq.getUserSession().getRoles(),
+					ITEM_SOURCE_NAME);
 			WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ORES, null,
 					wControl, true);
 			questionsCtrl = new QuestionsController(ureq, swControl, stackPanel, source, securityCallback,
 					TABLE_PREFERENCE_PREFIX);
 		} else {
-			questionsCtrl.updateSource(source);
+			questionsCtrl.updateSource();
 		}
 		return questionsCtrl;
 	}

src/main/java/org/olat/modules/qpool/ui/tree/MyTaxonomyLevelTreeNode.java

@@ -71,17 +71,17 @@ public class MyTaxonomyLevelTreeNode extends GenericTreeNode implements Controll
 
 	@Override
 	public Controller getController(UserRequest ureq, WindowControl wControl) {
-		QuestionItemsSource source = new MyTaxonomyLevelItemsSource(
-				ureq.getIdentity(),
-				ureq.getUserSession().getRoles(),
-				taxonomyLevel);
 		if (questionsCtrl == null) {
+			QuestionItemsSource source = new MyTaxonomyLevelItemsSource(
+					ureq.getIdentity(),
+					ureq.getUserSession().getRoles(),
+					taxonomyLevel);
 			OLATResourceable ores = OresHelper.createOLATResourceableInstance(MY_TAX_LEVEL + "_" + taxonomyLevel.getIdentifier(), taxonomyLevel.getKey());
 			WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ores, null, wControl, true);
 			questionsCtrl = new QuestionsController(ureq, swControl, stackPanel, source, securityCallback,
 					MY_TAX_LEVEL + taxonomyLevel.getKey());
 		} else {
-			questionsCtrl.updateSource(source);
+			questionsCtrl.updateSource();
 		}
 		return questionsCtrl;
 	}

src/main/java/org/olat/modules/qpool/ui/tree/PoolTreeNode.java

@@ -70,18 +70,18 @@ public class PoolTreeNode extends GenericTreeNode implements ControllerTreeNode
 
 	@Override
 	public Controller getController(UserRequest ureq, WindowControl wControl) {
-		PoolItemsSource source = new PoolItemsSource(
-				ureq.getIdentity(),
-				ureq.getUserSession().getRoles(),
-				pool);
-		source.setRemoveEnabled(isPoolAdmin(ureq, pool));
 		if(questionsCtrl == null) {
+			PoolItemsSource source = new PoolItemsSource(
+					ureq.getIdentity(),
+					ureq.getUserSession().getRoles(),
+					pool);
+			source.setRemoveEnabled(isPoolAdmin(ureq, pool));
 			WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, pool, null,
 					wControl, true);
 			questionsCtrl = new QuestionsController(ureq, swControl, stackPanel, source, securityCallback,
 					TABLE_PREFERENCE_PREFIX + pool.getKey());
 		} else {
-			questionsCtrl.updateSource(source);
+			questionsCtrl.updateSource();
 		}
 		return questionsCtrl;
 	}

src/main/java/org/olat/modules/qpool/ui/tree/ReviewTreeNode.java

@@ -83,8 +83,9 @@ public class ReviewTreeNode extends GenericTreeNode implements ControllerTreeNod
 			questionsCtrl = new QuestionsController(ureq, swControl, stackPanel, source, securityCallback,
 					REVIEW + taxonomyLevel.getKey());
 		} else {
-			questionsCtrl.updateSource(source);
+			questionsCtrl.updateSource();
 		}
+		reloadCount();
 		return questionsCtrl;
 	}