Author: jacopoc
Date: Wed Apr 22 12:46:51 2009
New Revision: 767496
URL: http://svn.apache.org/viewvc?rev=767496&view=rev
Log:
Misc fixes to the macro renderers for widgets, including the fix (by encoding
descriptions for the Uom) for the error reported by Ashish in OFBIZ-2337.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
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=767496&r1=767495&r2=767496&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
Wed Apr 22 12:46:51 2009
@@ -589,6 +589,7 @@
options.append("[");
Iterator<ModelFormField.OptionValue> optionValueIter =
allOptionValues.iterator();
int count = 0;
+ StringUtil.SimpleEncoder encoder =
(StringUtil.SimpleEncoder)context.get("simpleEncoder");
while (optionValueIter.hasNext()) {
ModelFormField.OptionValue optionValue =
(ModelFormField.OptionValue) optionValueIter
.next();
@@ -599,7 +600,11 @@
options.append(optionValue.getKey());
options.append("'");
options.append(",'description':'");
- options.append(optionValue.getDescription());
+ if (encoder != null) {
+ options.append(encoder.encode(optionValue.getDescription()));
+ } else {
+ options.append(optionValue.getDescription());
+ }
options.append("'}");
if (ajaxEnabled) {
count++;
@@ -1533,6 +1538,10 @@
sr.append(opGreaterThan);
sr.append("\" opGreaterThanEquals=\"");
sr.append(opGreaterThanEquals);
+ sr.append("\" opLessThan=\"");
+ sr.append(opLessThan);
+ sr.append("\" opLessThanEquals=\"");
+ sr.append(opLessThanEquals);
sr.append("\" value2=\"");
sr.append(value2);
sr.append("\" defaultOptionThru=\"");
Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=767496&r1=767495&r2=767496&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Wed Apr 22
12:46:51 2009
@@ -112,7 +112,9 @@
<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty><@makeBlock className value /></#macro>
-<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals value2 defaultOptionThru><@makeBlock className value
/></#macro>
+<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
+<@makeBlock className value />
+</#macro>
<#macro renderLookupField className alert name value size maxlength
autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc><@makeBlock className value /></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl commonDisplaying
paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle
ajaxLastUrl lastUrl paginateLastLabel></#macro>
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=767496&r1=767495&r2=767496&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Apr 22
12:46:51 2009
@@ -370,7 +370,7 @@
</#if>
</#macro>
-<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals value2 defaultOptionThru>
+<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
<input type="text" <@renderClass className alert /> <#if
name?has_content>name="${name}_fld0_value"</#if><#if value?has_content>
value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if
maxlength?has_content> maxlength="${maxlength}"</#if><#if
autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
<#if titleStyle?has_content>
<span class="${titleStyle}" ><#rt/>
@@ -389,8 +389,8 @@
<span class="${titleStyle}" ><#rt/>
</#if>
<select name=<#if name?has_content>"${name}_fld1_op"</#if>
class="selectBox"><#rt/>
-<option value="lessThan"<#if defaultOptionThru=="lessThan">
selected</#if>>${rp.opLessThan?html}</option><#rt/>
-<option value="lessThanEqualTo"<#if defaultOptionThru=="lessThanEqualTo">
selected</#if>>${rp.opLessThanEquals?html}</option><#rt/>
+<option value="lessThan"<#if defaultOptionThru=="lessThan">
selected</#if>>${opLessThan?html}</option><#rt/>
+<option value="lessThanEqualTo"<#if defaultOptionThru=="lessThanEqualTo">
selected</#if>>${opLessThanEquals?html}</option><#rt/>
</select><#rt/>
<#if titleStyle?has_content>
</span>
Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=767496&r1=767495&r2=767496&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Wed Apr 22
12:46:51 2009
@@ -90,7 +90,9 @@
<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty><@renderField value /></#macro>
-<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals value2 defaultOptionThru><@renderField value /></#macro>
+<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
+<@renderField value />
+</#macro>
<#macro renderLookupField className alert name value size maxlength
autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc><@renderField value /></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl commonDisplaying
paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle
ajaxLastUrl lastUrl paginateLastLabel></#macro>
Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=767496&r1=767495&r2=767496&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Wed Apr 22
12:46:51 2009
@@ -96,7 +96,8 @@
<#macro renderDateFindField className alert name localizedInputTitle value
size maxlength dateType formName defaultDateTimeString imgSrc
localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals
opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan
opUpToDay opUpThruDay opIsEmpty></#macro>
-<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals value2 defaultOptionThru></#macro>
+<#macro renderRangeFindField className alert name value size maxlength
autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan
opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
+</#macro>
<#macro renderLookupField className alert name value size maxlength
autocomplete descriptionFieldName formName lookupFieldFormName
targetParameterIter imgSrc></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl commonDisplaying
paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle
ajaxLastUrl lastUrl paginateLastLabel></#macro>
