You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/09/03 10:25:49 UTC
svn commit: r810808 - in /ofbiz/branches/release09.04: ./
framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
framework/widget/templates/htmlScreenMacroLibrary.ftl
Author: jleroux
Date: Thu Sep 3 08:25:49 2009
New Revision: 810808
URL: http://svn.apache.org/viewvc?rev=810808&view=rev
Log:
"Applied fix from trunk for revision: 810807 "
------------------------------------------------------------------------
r810807 | jleroux | 2009-09-03 10:22:49 +0200 (jeu., 03 sept. 2009) | 1 line
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/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 3 08:25:49 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807
Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=810808&r1=810807&r2=810808&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Thu Sep 3 08:25: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/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=810808&r1=810807&r2=810808&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl Thu Sep 3 08:25:49 2009
@@ -94,7 +94,7 @@
> </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>