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 bf5499be25 Fixed: PDF/CSV exports use current value for drop-down
fields (OFBIZ-12914)
bf5499be25 is described below
commit bf5499be2535399be84e091d3604475a9428ea59
Author: Daniel Watford <dan...@watfordconsulting.com>
AuthorDate: Sun Feb 25 18:05:54 2024 +0000
Fixed: PDF/CSV exports use current value for drop-down fields (OFBIZ-12914)
---
themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 6 ------
themes/common-theme/template/macro/FoFormMacroLibrary.ftl | 6 ------
2 files changed, 12 deletions(-)
diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
index 07bbb4466d..647e5c2d87 100644
--- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
@@ -31,13 +31,7 @@ under the License.
<#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 formName action
explicitDescription options fieldName otherFieldName otherValue otherFieldSize
ajaxEnabled ajaxOptions frequency minChars choices autoSelect partialSearch
partialChars ignoreCase fullSearch conditionGroup="" tabindex="" multiple=""
event="" size="" firstInList="" currentValue="" allowEmpty="" dDFCurrent=""
noCurrentSelectedKey="" disabled=false>
-<#if currentValue?has_content && firstInList?has_content>
<@renderField explicitDescription />
-<#else>
-<#list options as item>
-<@renderField item.description />
-</#list>
-</#if>
</#macro>
<#macro renderTooltip tooltip tooltipStyle></#macro>
diff --git a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
index 2d71b358a8..6a21bb45f5 100644
--- a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
@@ -58,13 +58,7 @@ under the License.
<#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 formName action
explicitDescription options fieldName otherFieldName otherValue otherFieldSize
ajaxEnabled ajaxOptions frequency minChars choices autoSelect partialSearch
partialChars ignoreCase fullSearch conditionGroup="" tabindex="" multiple=""
event="" size="" firstInList="" currentValue="" allowEmpty="" dDFCurrent=""
noCurrentSelectedKey="" disabled=false>
-<#if currentValue?has_content && firstInList?has_content>
<@makeBlock "" explicitDescription />
-<#else>
-<#list options as item>
-<@makeBlock "" item.description />
-</#list>
-</#if>
</#macro>
<#macro renderCheckField items className alert id currentValue name event
action conditionGroup tabindex disabled allChecked=""><@makeBlock "" ""
/></#macro>
