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
commit 1502617bcf656a8399d6b6407ec09dfde09882ab
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sat Mar 9 07:11:41 2024 +0100
Fixed: XLS generation is broken (OFBIZ-12933)
This adds <<closeOnSubmit="true">> to *FormMacroLibrary.ftl when missing
---
themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 1 +
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(+), 3 deletions(-)
diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
index 647e5c2d87..fbeb149d3f 100644
--- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
@@ -39,6 +39,7 @@ under the License.
<#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=""
disabled=false></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false closeOnSubmit="true"></#macro>
<#macro renderResetField className alert name title></#macro>
<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="" disabled=false></#macro>
diff --git a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
index 26115cd0f3..db08b78be6 100644
--- a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
@@ -44,7 +44,7 @@ under the License.
<#macro renderCheckField items className alert id currentValue name event
action conditionGroup tabindex disabled allChecked=""></#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=""
disabled=false></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false closeOnSubmit="true"></#macro>
<#macro renderResetField className alert name title></#macro>
<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="" disabled=false></#macro>
diff --git a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
index e4d7fe5f68..c0954c6523 100644
--- a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
@@ -46,7 +46,7 @@ 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=""
disabled=false></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false closeOnSubmit="true"></#macro>
<#macro renderResetField className alert name title></#macro>
diff --git a/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
b/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
index d736739abd..78f03c612f 100644
--- a/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
@@ -52,7 +52,7 @@ under the License.
<#macro renderCheckField items className alert id currentValue name event
action conditionGroup tabindex disabled allChecked=""></#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=""
disabled=false></#macro>
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false closeOnSubmit="true"></#macro>
<#macro renderResetField className alert name title></#macro>
<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="" disabled=false></#macro>
