Author: jleroux
Date: Thu Mar 11 10:17:15 2010
New Revision: 921773
URL: http://svn.apache.org/viewvc?rev=921773&view=rev
Log:
Allow double quote in title. This is possible because, at least OOTB, all title
should be localized. Hence from a label in an XML file, and nothing prevent to
use double quotes there
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
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=921773&r1=921772&r2=921773&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
Thu Mar 11 10:17:15 2010
@@ -1162,7 +1162,7 @@ public class MacroFormRenderer implement
sr.append(" name=\"");
sr.append(modelFormField.getModelForm().getName());
sr.append("\" title=\"");
- sr.append(title);
+ sr.append(FreeMarkerWorker.encodeDoubleQuotes(title));
sr.append("\" />");
executeMacro(sr.toString());
} else if (modelFormField.isSortField()) {
@@ -2421,7 +2421,6 @@ public class MacroFormRenderer implement
public void renderImageField(Appendable writer, Map<String, Object>
context, ImageField imageField) throws IOException {
ModelFormField modelFormField = imageField.getModelFormField();
- String border = Integer.toString(imageField.getBorder());
String value = modelFormField.getEntry(context,
imageField.getValue(context));
String width = "";
String height = "";