From a61c30acbeb1c5c4bddf9cbfc3049677f9bb23e4 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 21 Oct 2014 08:42:38 +0200
Subject: [PATCH] OO-1265: check if the tools are available to the user in the
top navigation
---
.../org/olat/gui/control/OlatTopNavController.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/gui/control/OlatTopNavController.java b/src/main/java/org/olat/gui/control/OlatTopNavController.java
index 5a461b1330c..072d343506f 100644
--- a/src/main/java/org/olat/gui/control/OlatTopNavController.java
+++ b/src/main/java/org/olat/gui/control/OlatTopNavController.java
@@ -233,12 +233,15 @@ public class OlatTopNavController extends BasicController implements GenericEven
}
}
+ Set<String> availableToolSet = userToolsModule.getAvailableUserToolSet();
+
for (Extension anExt : extManager.getExtensions()) {
// check for sites
ExtensionElement ae = anExt.getExtensionFor(HomeMainController.class.getName(), ureq);
- if (ae != null && ae instanceof GenericActionExtension) {
- if(anExt.isEnabled()){
- GenericActionExtension gAe = (GenericActionExtension) ae;
+ if (anExt.isEnabled() && ae instanceof GenericActionExtension) {
+ GenericActionExtension gAe = (GenericActionExtension) ae;
+ String extensionId = gAe.getUniqueExtensionID();
+ if(availableToolSet.contains(extensionId)) {
GenericTreeNode node = gAe.createMenuNode(ureq);
String linkName = "personal.tool." + node.getIdent();
Link link = LinkFactory.createLink(linkName, container, this);
@@ -255,7 +258,7 @@ public class OlatTopNavController extends BasicController implements GenericEven
configLinksName.add(linkName);
}
- if(selectedToolSet.contains(gAe.getUniqueExtensionID())) {
+ if(selectedToolSet.contains(extensionId)) {
String linkAltName = "personal.tool.alt." + node.getIdent();
Link linkAlt = LinkFactory.createLink(linkAltName, topNavVC, this);
linkAlt.setUserObject(gAe);
@@ -267,7 +270,7 @@ public class OlatTopNavController extends BasicController implements GenericEven
linkAlt.setIconLeftCSS(iconCssClass + " o_icon-lg");
toolSetLinksName.add(linkAltName);
}
- }
+ }
}
}
--
GitLab