From 97ba6dd1763680aa7db48364cb820e29ec888115 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 23 Apr 2015 14:34:53 +0200
Subject: [PATCH] OO-1507: fix missing return to block the link if someone
cancel the dirty alert
---
.../core/gui/components/tree/MenuTreeRenderer.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/tree/MenuTreeRenderer.java b/src/main/java/org/olat/core/gui/components/tree/MenuTreeRenderer.java
index 9c00f6d2859..27b466ca731 100644
--- a/src/main/java/org/olat/core/gui/components/tree/MenuTreeRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/tree/MenuTreeRenderer.java
@@ -278,7 +278,7 @@ public class MenuTreeRenderer extends DefaultComponentRenderer {
// expand icon
// add ajax support and real open/close function
if (((tree.isRootVisible() && level != 0) || !tree.isRootVisible()) && chdCnt > 0) { // root has not open/close icon, append open / close icon only if there is children
- target.append("<a onclick='");
+ target.append("<a onclick='return ");
if(tree.getMenuTreeItem() == null) {
target.append("o2cl_secure()");
} else {
@@ -288,7 +288,7 @@ public class MenuTreeRenderer extends DefaultComponentRenderer {
target.append("o2cl_noDirtyCheck()");
}
- target.append("' href=\"");
+ target.append(";' href=\"");
// Build menu item URI
String cmd = renderChildren ? MenuTree.TREENODE_CLOSE : MenuTree.TREENODE_OPEN;
@@ -353,9 +353,9 @@ public class MenuTreeRenderer extends DefaultComponentRenderer {
// add css class to identify level, FireFox script
if(tree.getMenuTreeItem() != null && tree.getMenuTreeItem().isNoDirtyCheckOnClick()) {
- target.append("<a onclick='o2cl_noDirtyCheck()' href=\"");
+ target.append("<a onclick='return o2cl_noDirtyCheck();' href=\"");
} else {
- target.append("<a onclick='o2cl_secure()' href=\"");
+ target.append("<a onclick='return o2cl_secure();' href=\"");
}
// Build menu item URI
@@ -445,7 +445,7 @@ public class MenuTreeRenderer extends DefaultComponentRenderer {
private void renderInsertCalloutButton(String cmd, String cssClass, StringOutput sb, TreeNode node, URLBuilder ubu, AJAXFlags flags) {
boolean iframePostEnabled = flags.isIframePostEnabled();
- sb.append("<a class='btn btn-default small' onclick='o2cl_secure()' href=\"");
+ sb.append("<a class='btn btn-default small' onclick='return o2cl_secure();' href=\"");
if (iframePostEnabled) {
ubu.buildURI(sb, new String[] { COMMAND_ID, NODE_IDENT }, new String[] { cmd, node.getIdent() }, AJAXFlags.MODE_TOBGIFRAME);
} else {
--
GitLab