OO-1273: fix open/close of pages in CP, fix open CP course node with sub...

OO-1273: fix open/close of pages in CP, fix open CP course node with sub course nodes and only one page

src/main/java/org/olat/course/run/navigation/NavigationHandler.java

@@ -36,6 +36,7 @@ import java.util.Set;
 import org.olat.core.gui.UserRequest;
 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;
@@ -210,12 +211,17 @@ public class NavigationHandler implements Disposable {
 
 			boolean dispatch = true;
 			if(userObject instanceof String) {
-				if(TreeEvent.COMMAND_TREENODE_OPEN.equals(treeEvent.getSubCommand())) {
+				if(MenuTree.COMMAND_TREENODE_CLICKED.equals(treeEvent.getCommand()) && treeEvent.getSubCommand() == null) {
+					openCourseNodeIds.add((String)userObject);
+					openTreeNodeIds.add((String)userObject);
+				} else if(TreeEvent.COMMAND_TREENODE_OPEN.equals(treeEvent.getSubCommand())) {
 					openCourseNodeIds.add((String)userObject);
 					openTreeNodeIds.add((String)userObject);
 					dispatch = false;
 				} else if(TreeEvent.COMMAND_TREENODE_CLOSE.equals(treeEvent.getSubCommand())) {
 					removeChildrenFromOpenNodes(selTN);
+					openCourseNodeIds.remove((String)userObject);
+					openTreeNodeIds.remove((String)userObject);
 					dispatch = false;
 				}
 			}
@@ -442,6 +448,12 @@ public class NavigationHandler implements Disposable {
 					//add the selected node to the open one, if not, strange behaviour
 					selectedCourseNodeId = courseNode.getIdent();
 					openCourseNodeIds.add(selectedCourseNodeId);
+					if(ncr != null) {
+						String subNodeId = ncr.getSelectedTreeNodeId();
+						if(subNodeId != null) {
+							openCourseNodeIds.add(subNodeId);
+						}
+					}
 				}
 				
 				openTreeNodeIds = convertToTreeNodeIds(treeEval, openCourseNodeIds);