From 4fea2ddefc3ccc3e654153f0cdf57b3fc66c5c4b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 17 Nov 2014 17:31:51 +0100
Subject: [PATCH] no-jira: prevent double opening of move and copy popup in
course editor
---
.../java/org/olat/course/editor/EditorMainController.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/course/editor/EditorMainController.java b/src/main/java/org/olat/course/editor/EditorMainController.java
index 579da614da9..e35618819ea 100644
--- a/src/main/java/org/olat/course/editor/EditorMainController.java
+++ b/src/main/java/org/olat/course/editor/EditorMainController.java
@@ -649,10 +649,7 @@ public class EditorMainController extends MainLayoutBasicController implements G
}
//aggressive clean-up
- removeAsListenerAndDispose(moveCopyController);
- removeAsListenerAndDispose(cmc);
- moveCopyController = null;
- cmc = null;
+ cleanUp();
} else if (source == insertNodeController) {
cmc.deactivate();
if (event == Event.DONE_EVENT) {
@@ -733,6 +730,8 @@ public class EditorMainController extends MainLayoutBasicController implements G
}
private void doMove(UserRequest ureq, ICourse course, boolean copy) {
+ if(moveCopyController != null) return;
+
TreeNode tn = menuTree.getSelectedNode();
if (tn == null) {
showError(NLS_MOVECOPYNODE_ERROR_SELECTFIRST);
--
GitLab