svn commit: r1053082 - in /ofbiz/branches/release10.04/framework/widget: src/org/ofbiz/widget/form/MacroFormRenderer.java templates/csvFormMacroLibrary.ftl

[jacopoc]

Author: jacopoc
Date: Mon Dec 27 15:08:43 2010
New Revision: 1053082

URL: http://svn.apache.org/viewvc?rev=1053082&view=rev
Log:
Backported from rev. 1053081: "A couple of fixes for csv exports: removed leading blank character in titles and fixed error caused by fields containing ampersands."

Modified:
    ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
    ofbiz/branches/release10.04/framework/widget/templates/csvFormMacroLibrary.ftl

Modified: ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1053082&r1=1053081&r2=1053082&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Mon Dec 27 15:08:43 2010
@@ -203,7 +203,7 @@ public class MacroFormRenderer implement
         sr.append("\" idName=\"");
         sr.append(idName);
         sr.append("\" description=\"");
-        sr.append(description);
+        sr.append(FreeMarkerWorker.encodeDoubleQuotes(description));
         sr.append("\" class=\"");
         sr.append(modelFormField.getWidgetStyle());
         sr.append("\" alert=\"");

Modified: ofbiz/branches/release10.04/framework/widget/templates/csvFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/templates/csvFormMacroLibrary.ftl?rev=1053082&r1=1053081&r2=1053082&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release10.04/framework/widget/templates/csvFormMacroLibrary.ftl Mon Dec 27 15:08:43 2010
@@ -50,7 +50,7 @@ under the License.
 <#macro renderHiddenField name value id event action></#macro>
 <#macro renderIgnoredField></#macro>
 
-<#macro renderFieldTitle style title fieldHelpText=""><@renderField title />, </#macro>
+<#macro renderFieldTitle style title fieldHelpText=""><@renderField title />,</#macro>
 <#macro renderSingleFormFieldTitle></#macro>
 
 <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit></#macro>