svn commit: r1435532 - in /ofbiz/branches/release12.04: ./ framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java

Author: jleroux
Date: Sat Jan 19 12:53:43 2013
New Revision: 1435532

URL: http://svn.apache.org/viewvc?rev=1435532&view=rev
Log:
"Applied fix from trunk for revision: 1435528  "
------------------------------------------------------------------------
r1435528 | jleroux | 2013-01-19 13:27:25 +0100 (sam., 19 janv. 2013) | 8 lines

A patch from Sumit Pandit for "HTML Validation error - Duplicate DIV id is created in <screenlet title=...></screenlet> tag." https://issues.apache.org/jira/browse/OFBIZ-5121

When ID has not been provided in <screenlet title=.../> tag, The generated DIV has an ID="_col". Including multiple screenlet in a page get result in multiple DIVs with duplicate ID ("_col").

For reference find duplicate div id("_col") in following page -  
https://demo-trunk.ofbiz.apache.org/catalog/control/EditProdCatalogCategories?prodCatalogId=DemoCatalog 


------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1435528

Modified: ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1435532&r1=1435531&r2=1435532&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Sat Jan 19 12:53:43 2013
@@ -74,6 +74,7 @@ public class MacroScreenRenderer impleme
     private int elementId = 999;
     protected boolean widgetCommentsEnabled = false;
     private static final String formrenderer = UtilProperties.getPropertyValue("widget", "screen.formrenderer");
+    private int screenLetsIdCounter = 1;
 
     public MacroScreenRenderer(String name, String macroLibraryPath) throws TemplateException, IOException {
         macroLibrary = FreeMarkerWorker.getTemplate(macroLibraryPath);
@@ -627,11 +628,17 @@ public class MacroScreenRenderer impleme
         }
 
         Map<String, Object> parameters = FastMap.newInstance();
-        parameters.put("id", screenlet.getId(context));
         parameters.put("title", title);
         parameters.put("collapsible", collapsible);
         parameters.put("saveCollapsed", screenlet.saveCollapsed());
-        parameters.put("collapsibleAreaId", screenlet.getId(context) + "_col");
+        if (UtilValidate.isNotEmpty (screenlet.getId(context))) {
+            parameters.put("id", screenlet.getId(context));
+            parameters.put("collapsibleAreaId", screenlet.getId(context) + "_col");
+        } else {
+            parameters.put("id", "screenlet_" + screenLetsIdCounter);
+            parameters.put("collapsibleAreaId","screenlet_" + screenLetsIdCounter + "_col");
+            screenLetsIdCounter++;
+        }
         parameters.put("expandToolTip", expandToolTip);
         parameters.put("collapseToolTip", collapseToolTip);
         parameters.put("fullUrlString", fullUrlString);