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 e9dbb227a9 Fixed: Improvement of the Check XML tag (OFBIZ-12821)
e9dbb227a9 is described below
commit e9dbb227a9c8fe4bdb84efc23ad3e07d2ea52145
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Feb 16 21:23:43 2024 +0100
Fixed: Improvement of the Check XML tag (OFBIZ-12821)
Like the 3 previous commits this fixes things rather than improve them.
During integration tests, the issue is in ***FormMacroLibrary.ftl files:
In a macro declaration, parameters without a default value must all occur
before
the parameters with default values.
---
themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/FoFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl | 6 +++---
themes/common-theme/template/macro/TextFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/XlsFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/XmlFormMacroLibrary.ftl | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
index 2890c4ba60..07bbb4466d 100644
--- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
@@ -41,7 +41,7 @@ under the License.
</#macro>
<#macro renderTooltip tooltip tooltipStyle></#macro>
-<#macro renderCheckField items className alert id allChecked="" currentValue
name event action conditionGroup tabindex disabled></#macro>
+<#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>
diff --git a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
index 6dd20f6342..2d71b358a8 100644
--- a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
@@ -67,7 +67,7 @@ under the License.
</#if>
</#macro>
-<#macro renderCheckField items className alert id allChecked="" currentValue
name event action conditionGroup tabindex disabled><@makeBlock "" "" /></#macro>
+<#macro renderCheckField items className alert id currentValue name event
action conditionGroup tabindex disabled allChecked=""><@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=""
disabled=false><@makeBlock "" "" /></#macro>
diff --git a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
index 8d5b2b8169..0bf3d23a5c 100644
--- a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
@@ -687,8 +687,8 @@ Parameter: delegatorName, String, optional - name of the
delegator in context.
data-lookup-ajax-url="${ajaxUrl}" <#rt>
/><#rt/>
<#if readonly?has_content && readonly>
- <a id="${id}_clear"
- style="background:none;margin-left:5px;margin-right:15px;"
+ <a id="${id}_clear"
+ style="background:none;margin-left:5px;margin-right:15px;"
class="clearField">
<#if
clearText?has_content>${clearText}<#else>${uiLabelMap.CommonClear}</#if>
</a>
@@ -698,7 +698,7 @@ Parameter: delegatorName, String, optional - name of the
delegator in context.
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel>
<#if listSize gt viewSize>
- <div class="${paginateStyle}">
+ <div class="${paginateStyle}">
<ul>
<li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a
href="javascript:void(0)" onclick="<#if
ajaxEnabled>ajaxUpdateAreas('${ajaxFirstUrl}')<#else>submitPagination(this,
'${firstUrl}')</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
<li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a
href="javascript:void(0)" onclick="<#if
ajaxEnabled>ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>submitPagination(this,
'${previousUrl}')</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
diff --git a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
index bb5ae18f67..26115cd0f3 100644
--- a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
@@ -41,7 +41,7 @@ under the License.
</#macro>
<#macro renderTooltip tooltip tooltipStyle></#macro>
-<#macro renderCheckField items className alert id allChecked="" currentValue
name event action conditionGroup tabindex disabled></#macro>
+<#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>
diff --git a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
index 4bb98a692c..e4d7fe5f68 100644
--- a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
@@ -42,7 +42,7 @@ under the License.
<#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><@renderItemField explicitDescription "txf"
className/></#macro>
-<#macro renderCheckField items className alert id allChecked="" currentValue
name event action conditionGroup tabindex disabled><@renderItemField
currentValue "txf" className/></#macro>
+<#macro renderCheckField items className alert id currentValue name event
action conditionGroup tabindex disabled allChecked=""><@renderItemField
currentValue "txf" className/></#macro>
<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action conditionGroup tabindex
disabled><@renderItemField currentValue "txf" className/></#macro>
diff --git a/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
b/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
index 5f189b476b..d736739abd 100644
--- a/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
@@ -49,7 +49,7 @@ under the License.
<#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>
-<#macro renderCheckField items className alert id allChecked="" currentValue
name event action conditionGroup tabindex disabled></#macro>
+<#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>
