This is an automated email from the ASF dual-hosted git repository.
jleroux 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 9a61ffd Fixed: Date picker not initialised in ajax-called form
(OFBIZ-)
9a61ffd is described below
commit 9a61ffddaa9643f67f4d2b2e627a24ac7af949c3
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sat Mar 19 12:13:41 2022 +0100
Fixed: Date picker not initialised in ajax-called form (OFBIZ-)
Initially wanting to make an useful commit to test changes I did to
allow/fix
the stable RAT report rendering, I randomly picked ofbiz-12111. While
working on
it I stumbled upon a wrong result when using
example/control/ExampleReportXls.
That's due to isXMLHttpRequest="" missing in the renderDateTimeField macro
signature in XlsFormMacroLibrary.ftl. I added it there, and while at
it at other such signatures.
I initially made the renderDateTimeField macro signatures same then in
HtmlFormMacroLibrary.ftl, but finally decided to only add
isXMLHttpRequest=""
Unfortunately this can be backported to 18.12 :D
---
themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/TextFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/XlsFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/XmlFormMacroLibrary.ftl | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
index f973c6c..17e7cc0 100644
--- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
@@ -28,7 +28,7 @@ under the License.
<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language=""
disabled=""><@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=""><@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 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>
diff --git a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
index a7d7f67..a7b2606 100644
--- a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
@@ -28,7 +28,7 @@ under the License.
<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language=""
disabled=""><@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=""><@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 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>
diff --git a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
index 1e999f0..db67d9d 100644
--- a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
@@ -34,7 +34,7 @@ under the License.
<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language=""
disabled=""></#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="">
+<#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="">
<#if dateType=="time" ><@renderItemField value "tf" className/>
<#elseif dateType=="date"><@renderItemField value "dt" className/>
<#else><@renderItemField value "dtf" className/></#if>
diff --git a/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
b/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
index 68b0e4b..e75d9ab 100644
--- a/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
@@ -44,7 +44,7 @@ under the License.
<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language=""
disabled=""><@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=""><@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 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>
