Author: ashish
Date: Sat May 21 06:31:15 2016
New Revision: 1744848
URL: http://svn.apache.org/viewvc?rev=1744848&view=rev
Log:
Applied bug fix from jira issue - OFBIZ-7074 - Error executing freeMarker
template when generating inventory report.
It seems that these changes are being taken care in trunk and Release15.12 but
doesn't get backported to 14.12 and 13.07. So committing these changes to both
the branches.
Thanks so much Ravi for the contribution(creating the issue and providing the
patch for the same).
Modified:
ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl
Modified:
ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl?rev=1744848&r1=1744847&r2=1744848&view=diff
==============================================================================
---
ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl
(original)
+++
ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl
Sat May 21 06:31:15 2016
@@ -50,7 +50,7 @@ under the License.
</#macro>
<#macro renderHyperlinkField></#macro>
-<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask><@makeBlock
className value /></#macro>
+<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask
placeholder=""><@makeBlock className value /></#macro>
<#macro renderTextareaField name className alert cols rows id readonly value
visualEditorEnable language buttons><@makeBlock className value /></#macro>
@@ -125,7 +125,7 @@ under the License.
<@makeBlock className value />
</#macro>
-<#macro renderLookupField className alert name value size maxlength id event
action readonly autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription initiallyCollapsed></#macro>
+<#macro renderLookupField className alert name value size maxlength id event
action readonly autocomplete descriptionFieldName formName fieldFormName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription initiallyCollapsed
lastViewName=""></#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel></#macro>
<#macro renderFileField className alert name value size maxlength
autocomplete><@makeBlock className value /></#macro>
<#macro renderPasswordField className alert name value size maxlength id
autocomplete><@makeBlock className "" /></#macro>
