Author: ashish
Date: Tue Mar 27 04:56:19 2012 New Revision: 1305732 URL: http://svn.apache.org/viewvc?rev=1305732&view=rev Log: Bug fix: Applied fix from trunk r1245778. A patch from Kiran Gawde "renderFormClose is missing arguments containerId, hasRequiredField" https://issues.apache.org/jira/browse/OFBIZ-4701 In htmlFormMacrolLibrary.ftl, renderFormClose has containerId, hasRequiredField. But csv, fo, text, xml FormMacroLibary.ftl don't have these fields for this macro. Modified: ofbiz/branches/release11.04/framework/widget/templates/csvFormMacroLibrary.ftl ofbiz/branches/release11.04/framework/widget/templates/foFormMacroLibrary.ftl ofbiz/branches/release11.04/framework/widget/templates/textFormMacroLibrary.ftl Modified: ofbiz/branches/release11.04/framework/widget/templates/csvFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/templates/csvFormMacroLibrary.ftl?rev=1305732&r1=1305731&r2=1305732&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/widget/templates/csvFormMacroLibrary.ftl (original) +++ ofbiz/branches/release11.04/framework/widget/templates/csvFormMacroLibrary.ftl Tue Mar 27 04:56:19 2012 @@ -54,7 +54,7 @@ under the License. <#macro renderSingleFormFieldTitle></#macro> <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit></#macro> -<#macro renderFormClose focusFieldName formName></#macro> +<#macro renderFormClose focusFieldName formName containerId hasRequiredField></#macro> <#macro renderMultiFormClose></#macro> <#macro renderFormatListWrapperOpen formName style columnStyles></#macro> Modified: ofbiz/branches/release11.04/framework/widget/templates/foFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/templates/foFormMacroLibrary.ftl?rev=1305732&r1=1305731&r2=1305732&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/widget/templates/foFormMacroLibrary.ftl (original) +++ ofbiz/branches/release11.04/framework/widget/templates/foFormMacroLibrary.ftl Tue Mar 27 04:56:19 2012 @@ -77,7 +77,7 @@ under the License. <#macro renderSingleFormFieldTitle title>${title?default("")}</#macro> <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit></#macro> -<#macro renderFormClose focusFieldName formName></#macro> +<#macro renderFormClose focusFieldName formName containerId hasRequiredField></#macro> <#macro renderMultiFormClose></#macro> <#macro renderFormatListWrapperOpen formName style columnStyles><fo:table border="solid black"><#list columnStyles as columnStyle><fo:table-column<#if columnStyle?has_content> <@getFoStyle columnStyle/></#if>/></#list></#macro> Modified: ofbiz/branches/release11.04/framework/widget/templates/textFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/templates/textFormMacroLibrary.ftl?rev=1305732&r1=1305731&r2=1305732&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/widget/templates/textFormMacroLibrary.ftl (original) +++ ofbiz/branches/release11.04/framework/widget/templates/textFormMacroLibrary.ftl Tue Mar 27 04:56:19 2012 @@ -54,7 +54,7 @@ under the License. <#macro renderSingleFormFieldTitle></#macro> <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name useRowSubmit></#macro> -<#macro renderFormClose focusFieldName formName></#macro> +<#macro renderFormClose focusFieldName formName containerId hasRequiredField></#macro> <#macro renderMultiFormClose></#macro> <#macro renderFormatListWrapperOpen formName style columnStyles></#macro> |
Free forum by Nabble | Edit this page |