MenuAction mapping is fixed for the case if no item is selected. The default selectio...

[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..57f88f809040d2aa0969d409d52c39dba4b20d58 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/menuitem.jsp
+++ b/Workspace/Siman/WebContent/jsp/menuitem.jsp
@@ -7,7 +7,8 @@
 <%@ page import="org.splat.simer.Action"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
 
-  <s:set var="menuname" value="leftMenuSettings.menuName" />
+  <%@page import="com.opensymphony.xwork2.ActionContext"%>
+<s:set var="menuname" value="leftMenuSettings.menuName" />
   <s:set var="namespace" value="leftMenuSettings.menuNamespace" />
 
 <!-- Display of the menu tab
@@ -21,7 +22,8 @@
   -->
   <div id=menuitem-box>
 <%
-       Menu menu = Action.getStaticMenu();
+    Action anAction = (Action)ActionContext.getContext().getActionInvocation().getAction();
+       Menu menu = anAction.getLeftMenuSettings().getMenu();
     boolean submenu = false;
     for (Iterator<MenuItem> listem = menu.asList().iterator(); listem.hasNext(); ) {
        MenuItem item  = listem.next();