Copyrights update 2015.

[tools/siman.git] / Workspace / Siman / WebContent / jsp / menuitem.jsp

diff --git a/Workspace/Siman/WebContent/jsp/menuitem.jsp b/Workspace/Siman/WebContent/jsp/menuitem.jsp
index 2eb236ee822b0886c87bac375dd1cf26e713bd0b..aa0f5278685fc437ff6e0bd578d7a11d46f37998 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/menuitem.jsp
+++ b/Workspace/Siman/WebContent/jsp/menuitem.jsp
@@ -5,9 +5,10 @@
 <%@ page import="org.splat.wapp.Menu"%>
 <%@ page import="org.splat.wapp.MenuItem"%>
 <%@ page import="org.splat.simer.Action"%>
+<%@page import="com.opensymphony.xwork2.ActionContext"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
 
-  <s:set var="menuname" value="leftMenuSettings.menuName" />
+<s:set var="menuname" value="leftMenuSettings.menuName" />
   <s:set var="namespace" value="leftMenuSettings.menuNamespace" />
 
 <!-- Display of the menu tab
@@ -21,8 +22,12 @@
   -->
   <div id=menuitem-box>
 <%
-       Menu menu = Action.getStaticMenu();
+    Action anAction = (Action)ActionContext.getContext().getActionInvocation().getAction();
+       Menu menu = anAction.getLeftMenuSettings().getMenu();
     boolean submenu = false;
+%>
+<s:if test="leftMenuSettings.menu != null">
+<%    
     for (Iterator<MenuItem> listem = menu.asList().iterator(); listem.hasNext(); ) {
        MenuItem item  = listem.next();
        String   arrow = "image.hold.gif";
@@ -87,4 +92,5 @@
           </div>
 <%  }
 %>  
+</s:if>
   </div>
\ No newline at end of file