svn commit: r941196 - in /ofbiz/branches/release10.04: ./ framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java

[erwan]

Author: erwan
Date: Wed May  5 08:23:57 2010
New Revision: 941196

URL: http://svn.apache.org/viewvc?rev=941196&view=rev
Log:
Applied fix from trunk for revision: 941007 
 Update on r938816 to make portals menus work again

Modified:
    ofbiz/branches/release10.04/   (props changed)
    
ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 08:23:57 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007

Modified: 
ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=941196&r1=941195&r2=941196&view=diff
==============================================================================
--- 
ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
 (original)
+++ 
ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
 Wed May  5 08:23:57 2010
@@ -290,12 +290,12 @@ public class ModelMenuItem {
                         localItem.name =  portalPage.getString("portalPageId");
                         localItem.setTitle((String) 
portalPage.get("portalPageName", locale));
                         localItem.link = new Link(this);
-                        Map<String, String> linkParams = 
localItem.link.getParameterMap(context);
-                        linkParams.put("portalPageId", 
portalPage.getString("portalPageId"));
-                        linkParams.put("parentPortalPageId", 
parentPortalPageId);
+                        List<WidgetWorker.Parameter> linkParams = 
localItem.link.getParameterList();
+                        linkParams.add(new 
WidgetWorker.Parameter("portalPageId", portalPage.getString("portalPageId"), 
false));
+                        linkParams.add(new 
WidgetWorker.Parameter("parentPortalPageId", parentPortalPageId, false));
                         if (link != null) {
                             
localItem.link.setTarget(link.targetExdr.getOriginal());
-                            linkParams.putAll(link.getParameterMap(context));
+                            linkParams.addAll(link.parameterList);
                         } else {
                             localItem.link.setTarget("showPortalPage");
                         }
@@ -742,6 +742,9 @@ public class ModelMenuItem {
             return this.linkType;
         }
 
+        public List<WidgetWorker.Parameter> getParameterList() {
+            return this.parameterList;
+        }
         public Map<String, String> getParameterMap(Map<String, Object> 
context) {
             Map<String, String> fullParameterMap = FastMap.newInstance();