This is an automated email from the ASF dual-hosted git repository.
danwatford pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 614fbe9fc8 Fixed: Synchronised FTL macro parameters for the various
output types (OFBIZ-12126)
614fbe9fc8 is described below
commit 614fbe9fc81be3454e5927593cb0722e35024d1a
Author: Daniel Watford <[email protected]>
AuthorDate: Thu Nov 17 16:52:11 2022 +0000
Fixed: Synchronised FTL macro parameters for the various output types
(OFBIZ-12126)
Following changes to how FTL macro parameter lists for HTML screens,
corresponding changes needed to be made for text, xml, pdf (fo), csv and
xls screens.
---
themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 8 ++++----
themes/common-theme/template/macro/FoFormMacroLibrary.ftl | 8 ++++----
themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/TextFormMacroLibrary.ftl | 6 +++---
themes/common-theme/template/macro/XlsFormMacroLibrary.ftl | 8 ++++----
themes/common-theme/template/macro/XmlFormMacroLibrary.ftl | 8 ++++----
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
index 17e7cc08a8..de1943e253 100644
--- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
@@ -26,9 +26,9 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask tabindex readonly
placeholder="" delegatorName="default"><@renderField value /></#macro>
-<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language=""
disabled=""><@renderField value /></#macro>
+<#macro renderTextareaField name className alert cols="" rows="" maxlength=""
id="" readonly="" value="" visualEditorEnable="" buttons="" tabindex=""
language="" disabled=false></#macro>
-<#macro renderDateTimeField name className alert title value size maxlength id
dateType shortDateInput timeDropdownParamName defaultDateTimeString
localizedIconTitle timeDropdown timeHourName classString hour1 hour2
timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName mask="" event="" action="" step="" timeValues=""
tabindex="" disabled="" isXMLHttpRequest=""><@renderField value /></#macro>
+<#macro renderDateTimeField name className timeDropdownParamName
defaultDateTimeString localizedIconTitle timeHourName timeMinutesName ampmName
compositeType alert=false isTimeType=false isDateType=false amSelected=false
pmSelected=false timeDropdown="" classString="" isTwelveHour=false hour1=""
hour2="" minutes=0 shortDateInput="" title="" value="" size="" maxlength=""
id="" formName="" mask="" event="" action="" step="" timeValues="" tabindex=""
disabled=false isXMLHttpRequest=false><@ [...]
<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch
conditionGroup tabindex disabled>
<#if currentValue?has_content && firstInList?has_content>
@@ -44,10 +44,10 @@ under the License.
<#macro renderCheckField items className alert id allChecked currentValue name
event action conditionGroup tabindex disabled></#macro>
<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action conditionGroup tabindex
disabled></#macro>
-<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title name event confirmation containerId tabindex></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false></#macro>
<#macro renderResetField className alert name title></#macro>
-<#macro renderHiddenField name conditionGroup value id event action></#macro>
+<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="" disabled=false></#macro>
<#macro renderIgnoredField></#macro>
<#macro renderFieldTitle style title id="" fieldHelpText=""
for=""><@renderField title />,</#macro>
diff --git a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
index 075943328d..1120231b91 100644
--- a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
@@ -53,9 +53,9 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask tabindex readonly
placeholder="" delegatorName="default"><@makeBlock className value /></#macro>
-<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable language buttons tabindex language=""
disabled=""><@makeBlock className value /></#macro>
+<#macro renderTextareaField name className alert cols="" rows="" maxlength=""
id="" readonly="" value="" visualEditorEnable="" buttons="" tabindex=""
language="" disabled=false><@makeBlock className value /></#macro>
-<#macro renderDateTimeField name className alert title value size maxlength
step timeValues id event action dateType shortDateInput timeDropdownParamName
defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString
hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName mask="" event="" action="" step="" timeValues=""
tabindex="" disabled="" isXMLHttpRequest=""><@makeBlock className value
/></#macro>
+<#macro renderDateTimeField name className timeDropdownParamName
defaultDateTimeString localizedIconTitle timeHourName timeMinutesName ampmName
compositeType alert=false isTimeType=false isDateType=false amSelected=false
pmSelected=false timeDropdown="" classString="" isTwelveHour=false hour1=""
hour2="" minutes=0 shortDateInput="" title="" value="" size="" maxlength=""
id="" formName="" mask="" event="" action="" step="" timeValues="" tabindex=""
disabled=false isXMLHttpRequest=false></#macro>
<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size explicitDescription allowEmpty options
fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled
noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect
partialSearch partialChars ignoreCase fullSearch conditionGroup tabindex
firstInList="" currentValue="" disabled="">
<#if currentValue?has_content && firstInList?has_content>
@@ -70,10 +70,10 @@ under the License.
<#macro renderCheckField items className alert id allChecked currentValue name
event action conditionGroup tabindex disabled><@makeBlock "" "" /></#macro>
<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action conditionGroup tabindex
disabled><@makeBlock "" "" /></#macro>
-<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title name event confirmation containerId tabindex><@makeBlock "" ""
/></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false><@makeBlock "" "" /></#macro>
<#macro renderResetField className alert name title><@makeBlock "" ""
/></#macro>
-<#macro renderHiddenField name conditionGroup value id event
action><!--hidden--></#macro>
+<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="" disabled=false><!--hidden--></#macro>
<#macro renderIgnoredField><!--ignore--></#macro>
<#macro renderFieldTitle style title id fieldHelpText="" for=""><fo:block
<@getFoStyle style/>>${title?default("")?replace(" ", "
")}</fo:block></#macro>
diff --git a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
index 156da6d3a4..5589324b6e 100644
--- a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
@@ -88,7 +88,7 @@ under the License.
</textarea><#lt/>
</#macro>
-<#macro renderDateTimeField name className alert timeDropdownParamName
defaultDateTimeString localizedIconTitle timeHourName timeMinutesName ampmName
compositeType isTimeType=false isDateType=false amSelected=false
pmSelected=false timeDropdown="" classString="" isTwelveHour=false hour1=""
hour2="" minutes=0 shortDateInput="" title="" value="" size="" maxlength=""
id="" formName="" mask="" event="" action="" step="" timeValues="" tabindex=""
disabled=false isXMLHttpRequest="">
+<#macro renderDateTimeField name className timeDropdownParamName
defaultDateTimeString localizedIconTitle timeHourName timeMinutesName ampmName
compositeType alert=false isTimeType=false isDateType=false amSelected=false
pmSelected=false timeDropdown="" classString="" isTwelveHour=false hour1=""
hour2="" minutes=0 shortDateInput="" title="" value="" size="" maxlength=""
id="" formName="" mask="" event="" action="" step="" timeValues="" tabindex=""
disabled=false isXMLHttpRequest=false>
<span class="view-calendar">
<#local cultureInfo =
Static["org.apache.ofbiz.common.JsLanguageFilesMappingUtil"].getFile("datejs",
.locale)/>
<#local datePickerLang =
Static["org.apache.ofbiz.common.JsLanguageFilesMappingUtil"].getFile("jquery",
.locale)/>
diff --git a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
index a7b2606e48..647a7d441c 100644
--- a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
@@ -26,7 +26,7 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask tabindex readonly
placeholder="" delegatorName="default"><@renderField value /></#macro>
-<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language=""
disabled=""><@renderField value /></#macro>
+<#macro renderTextareaField name className alert cols="" rows="" maxlength=""
id="" readonly="" value="" visualEditorEnable="" buttons="" tabindex=""
language="" disabled=false><@renderField value /></#macro>
<#macro renderDateTimeField name className alert title value size maxlength id
dateType shortDateInput timeDropdownParamName defaultDateTimeString
localizedIconTitle timeDropdown timeHourName classString hour1 hour2
timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName mask="" event="" action="" step="" timeValues=""
tabindex="" disabled="" isXMLHttpRequest=""><@renderField value /></#macro>
@@ -44,10 +44,10 @@ under the License.
<#macro renderCheckField items className alert id allChecked currentValue name
event action conditionGroup tabindex disabled></#macro>
<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action conditionGroup tabindex
disabled></#macro>
-<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title name event confirmation containerId tabindex></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false></#macro>
<#macro renderResetField className alert name title></#macro>
-<#macro renderHiddenField name conditionGroup value id event action></#macro>
+<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="" disabled=false></#macro>
<#macro renderIgnoredField></#macro>
<#macro renderFieldTitle style title id fieldHelpText="" for=""><@renderField
title /></#macro>
diff --git a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
index d4c564854c..df5b199859 100644
--- a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
@@ -32,9 +32,9 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask tabindex readonly
placeholder="" delegatorName="default"><@renderItemField value "txf"
className/></#macro>
-<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language=""
disabled=""></#macro>
+<#macro renderTextareaField name className alert cols="" rows="" maxlength=""
id="" readonly="" value="" visualEditorEnable="" buttons="" tabindex=""
language="" disabled=false></#macro>
-<#macro renderDateTimeField name className alert title value size maxlength id
isTimeType isDateType shortDateInput timeDropdownParamName
defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString
hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName mask="" event="" action="" step="" timeValues=""
tabindex="" disabled="" isXMLHttpRequest="">
+<#macro renderDateTimeField name className timeDropdownParamName
defaultDateTimeString localizedIconTitle timeHourName timeMinutesName ampmName
compositeType alert=false isTimeType=false isDateType=false amSelected=false
pmSelected=false timeDropdown="" classString="" isTwelveHour=false hour1=""
hour2="" minutes=0 shortDateInput="" title="" value="" size="" maxlength=""
id="" formName="" mask="" event="" action="" step="" timeValues="" tabindex=""
disabled=false isXMLHttpRequest=false>
<#if isTimeType ><@renderItemField value "tf" className/>
<#elseif isDateType><@renderItemField value "dt" className/>
<#else><@renderItemField value "dtf" className/></#if>
@@ -46,11 +46,11 @@ under the License.
<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action conditionGroup tabindex
disabled><@renderItemField currentValue "txf" className/></#macro>
-<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title name event confirmation containerId tabindex></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false></#macro>
<#macro renderResetField className alert name title></#macro>
-<#macro renderHiddenField name conditionGroup value id event action></#macro>
+<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="" disabled=false></#macro>
<#macro renderIgnoredField></#macro>
diff --git a/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
b/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
index e75d9ab4e2..6f6eff5714 100644
--- a/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
@@ -42,9 +42,9 @@ under the License.
<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask tabindex readonly
placeholder="" delegatorName="default"><@renderField value/></#macro>
-<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language=""
disabled=""><@renderField value/></#macro>
+<#macro renderTextareaField name className alert cols="" rows="" maxlength=""
id="" readonly="" value="" visualEditorEnable="" buttons="" tabindex=""
language="" disabled=false><@renderField value/></#macro>
-<#macro renderDateTimeField name className alert title value size maxlength id
dateType shortDateInput timeDropdownParamName defaultDateTimeString
localizedIconTitle timeDropdown timeHourName classString hour1 hour2
timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName mask="" event="" action="" step="" timeValues=""
tabindex="" disabled="" isXMLHttpRequest=""><@renderField value/></#macro>
+<#macro renderDateTimeField name className timeDropdownParamName
defaultDateTimeString localizedIconTitle timeHourName timeMinutesName ampmName
compositeType alert=false isTimeType=false isDateType=false amSelected=false
pmSelected=false timeDropdown="" classString="" isTwelveHour=false hour1=""
hour2="" minutes=0 shortDateInput="" title="" value="" size="" maxlength=""
id="" formName="" mask="" event="" action="" step="" timeValues="" tabindex=""
disabled=false isXMLHttpRequest=false><@ [...]
<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch
conditionGroup tabindex disabled>
</#macro>
@@ -52,10 +52,10 @@ under the License.
<#macro renderCheckField items className alert id allChecked currentValue name
event action conditionGroup tabindex disabled></#macro>
<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action conditionGroup tabindex
disabled></#macro>
-<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title name event confirmation containerId tabindex></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false></#macro>
<#macro renderResetField className alert name title></#macro>
-<#macro renderHiddenField name conditionGroup value id event action></#macro>
+<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="" disabled=false></#macro>
<#macro renderIgnoredField></#macro>
<#macro renderFieldTitle style title id fieldHelpText="" for=""></#macro>
