svn commit: r810807 - in /ofbiz/trunk/framework/widget: src/org/ofbiz/widget/screen/MacroScreenRenderer.java templates/htmlScreenMacroLibrary.ftl

Author: jleroux
Date: Thu Sep  3 08:22:49 2009
New Revision: 810807

URL: http://svn.apache.org/viewvc?rev=810807&view=rev
Log:
A patch from Nicolas Malin 'error whan parsing menu with " on screelet header' (https://issues.apache.org/jira/browse/OFBIZ-2873) - OFBIZ-2873

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
    ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=810807&r1=810806&r2=810807&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Thu Sep  3 08:22:49 2009
@@ -673,7 +673,7 @@
         sr.append("\" padded=");
         sr.append(Boolean.toString(padded));
         sr.append(" menuString=\"");
-        sr.append(menuString.replaceAll("\"", "'"));//FIXME change the " to ' for fix the macro invoke
+        sr.append(menuString.replaceAll("\"", "µµ"));
         sr.append("\" showMore=");
         sr.append(Boolean.toString(showMore));
         sr.append(" collapsed=");

Modified: ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=810807&r1=810806&r2=810807&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl Thu Sep  3 08:22:49 2009
@@ -94,7 +94,7 @@
 >&nbsp</a></li>
 </#if>
 <#if !collapsed>
-${menuString}
+${menuString?replace("µµ","\"")}
 </#if>
 </ul><br class="clear" /></div><div <#if collapsibleAreaId?has_content> id="${collapsibleAreaId}" <#if collapsed> style="display: none;"</#if></#if><#if padded> class="screenlet-body"</#if>>
 </#if>