From 0c7660390be6dce42ea5dfe95ea4848de0724dad Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 6 Nov 2014 10:28:09 +0100
Subject: [PATCH] no-jira: fix menu.html log error from velocity, fix warnings
---
.../org/olat/core/gui/control/generic/dtabs/DTabImpl.java | 2 --
src/main/java/org/olat/gui/control/_content/menu.html | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/control/generic/dtabs/DTabImpl.java b/src/main/java/org/olat/core/gui/control/generic/dtabs/DTabImpl.java
index 26383464ab4..0e2ff3ad2d1 100644
--- a/src/main/java/org/olat/core/gui/control/generic/dtabs/DTabImpl.java
+++ b/src/main/java/org/olat/core/gui/control/generic/dtabs/DTabImpl.java
@@ -37,8 +37,6 @@ import org.olat.core.gui.control.navigation.NavElement;
import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.StackedBusinessControl;
-import org.olat.core.util.Formatter;
-import org.olat.core.util.i18n.I18nManager;
import org.olat.repository.ui.RepositoyUIFactory;
/**
diff --git a/src/main/java/org/olat/gui/control/_content/menu.html b/src/main/java/org/olat/gui/control/_content/menu.html
index 1a1856dce9c..c3b38ad6179 100644
--- a/src/main/java/org/olat/gui/control/_content/menu.html
+++ b/src/main/java/org/olat/gui/control/_content/menu.html
@@ -3,20 +3,20 @@
#foreach($search in $searchs)
<li>$r.render($search)</li>
#end
- #if($personalTools.size() > 0)
+ #if($personalTools && $personalTools.size() > 0)
<li role="presentation" class="dropdown-header">$r.translate("topnav.my.menu.tools")</li>
#foreach($personalTool in $personalTools)
<li>$r.render($personalTool)</li>
#end
#end
- #if($configs.size() > 0)
+ #if($configs && $configs.size() > 0)
<li role="presentation" class="divider"></li>
<li role="presentation" class="dropdown-header">$r.translate("topnav.my.menu.configurations")</li>
#foreach($config in $configs)
<li>$r.render($config)</li>
#end
#end
- #if($systems.size() > 0)
+ #if($systems && $systems.size() > 0)
<li role="presentation" class="divider"></li>
<li role="presentation" class="dropdown-header">$r.translate("topnav.my.menu.systems")</li>
#foreach($system in $systems)
--
GitLab