From 11e1651092a31b2037a776d9fc2130233bad28b8 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 6 Jun 2019 09:44:58 +0200
Subject: [PATCH] OO-4076: make sure node is selected before choosing it
---
.../org/olat/user/ui/admin/UserAdminMainController.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/user/ui/admin/UserAdminMainController.java b/src/main/java/org/olat/user/ui/admin/UserAdminMainController.java
index 57ef907da19..d04e94bfc9c 100644
--- a/src/main/java/org/olat/user/ui/admin/UserAdminMainController.java
+++ b/src/main/java/org/olat/user/ui/admin/UserAdminMainController.java
@@ -60,6 +60,7 @@ import org.olat.core.gui.components.stack.TooledStackedPanel.Align;
import org.olat.core.gui.components.tree.GenericTreeModel;
import org.olat.core.gui.components.tree.GenericTreeNode;
import org.olat.core.gui.components.tree.MenuTree;
+import org.olat.core.gui.components.tree.TreeEvent;
import org.olat.core.gui.components.tree.TreeModel;
import org.olat.core.gui.components.tree.TreeNode;
import org.olat.core.gui.control.Controller;
@@ -192,9 +193,11 @@ public class UserAdminMainController extends MainLayoutBasicController implement
@Override
public void event(UserRequest ureq, Component source, Event event) {
if (source == menuTree) {
- if (event.getCommand().equals(MenuTree.COMMAND_TREENODE_CLICKED)) {
- TreeNode selTreeNode = menuTree.getSelectedNode();
- contentCtr = pushController(ureq, selTreeNode);
+ if (event.getCommand().equals(MenuTree.COMMAND_TREENODE_CLICKED) && event instanceof TreeEvent) {
+ TreeNode selTreeNode = menuTree.getTreeModel().getNodeById(((TreeEvent)event).getNodeId());
+ if(selTreeNode != null) {
+ contentCtr = pushController(ureq, selTreeNode);
+ }
} else { // the action was not allowed anymore
content.popUpToRootController(ureq);
}
--
GitLab