You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bi...@apache.org on 2009/11/21 00:52:31 UTC

svn commit: r882794 - in /ofbiz/trunk: framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java framework/widget/src/org/ofbiz/widget/form/ModelForm.java specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js

Author: bibryam
Date: Fri Nov 20 23:52:31 2009
New Revision: 882794

URL: http://svn.apache.org/viewvc?rev=882794&view=rev
Log:
Made forms inside list forms with unique IDs

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js   (props changed)

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=882794&r1=882793&r2=882794&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Fri Nov 20 23:52:31 2009
@@ -1005,7 +1005,7 @@
             }
         }
 
-        String formId = modelForm.getContainerId();
+        String formId = modelForm.getCurrentContainerId(context);
         List<ModelForm.UpdateArea> updateAreas = modelForm.getOnSubmitUpdateAreas();
         // This is here for backwards compatibility. Use on-event-update-area
         // elements instead.
@@ -1153,7 +1153,7 @@
         }
         String formType = modelForm.getType();
         String targetWindow = modelForm.getTargetWindow(context);
-        String containerId =  modelForm.getContainerId();
+        String containerId =  modelForm.getCurrentContainerId(context);
         String containerStyle =  modelForm.getContainerStyle();
         String autocomplete = "";
         String name = modelForm.getCurrentFormName(context);

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=882794&r1=882793&r2=882794&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Fri Nov 20 23:52:31 2009
@@ -1927,7 +1927,16 @@
             return this.getName();
         }
     }
-
+    
+    public String getCurrentContainerId(Map<String, Object> context) {
+        Integer itemIndex = (Integer) context.get("itemIndex");
+        if (itemIndex != null && "list".equals(this.getType())) {
+            return this.getContainerId() + this.getItemIndexSeparator() + itemIndex.intValue();
+        } 
+        
+        return this.getContainerId();
+    }
+    
     public String getContainerStyle() {
         return this.containerStyle;
     }

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js
            ('svn:mergeinfo' removed)