This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 6b2fd96df8 Revert "Fixed: dateType parameter not existing in
"renderDateTimeField" Macro (OFBIZ-13039)"
6b2fd96df8 is described below
commit 6b2fd96df8f7657209f604ee75fdbc341d5117d3
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Jun 14 18:40:11 2024 +0200
Revert "Fixed: dateType parameter not existing in "renderDateTimeField"
Macro (OFBIZ-13039)"
This reverts commit 35b4b89f285d92445d6ade017c72b20fa4aa0a89.
It was my bad to change dateType to isDateType in 18.12. It's not
implemented
there. There is now no isDateType string at all in OFBiz code.
I spotted this error in stable demo error.log
---
themes/common-theme/template/includes/CommonMacros.ftl | 2 +-
themes/common-theme/template/macro/TextFormMacroLibrary.ftl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/themes/common-theme/template/includes/CommonMacros.ftl
b/themes/common-theme/template/includes/CommonMacros.ftl
index d5b0919168..4548c8d227 100644
--- a/themes/common-theme/template/includes/CommonMacros.ftl
+++ b/themes/common-theme/template/includes/CommonMacros.ftl
@@ -33,7 +33,7 @@ your template file:
<#if javaScriptEnabled>
<@htmlTemplate.renderDateTimeField name="${fieldName}" event="${event!}"
action="${action!}"
className="${fieldClass!''}" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${fieldValue!''}"
- size="25" maxlength="30" id="${fieldName}1" isDateType=true
shortDateInput=false timeDropdownParamName=""
+ size="25" maxlength="30" id="${fieldName}1" dateType="date"
shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown=""
timeHourName="" classString=""
hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
diff --git a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
index 42890fef7b..228611efe9 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=""><@renderField
value /></#macro>
-<#macro renderDateTimeField name className alert title value size maxlength id
shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle
timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes
isTwelveHour ampmName amSelected pmSelected compositeType formName mask=""
event="" action="" step="" timeValues="" tabindex="" ><@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="" ><@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>
<#if currentValue?has_content && firstInList?has_content>
@@ -122,4 +122,4 @@ under the License.
<#macro renderAsterisks requiredField requiredStyle>*</#macro>
<#macro makeHiddenFormLinkForm actionUrl name parameters targetWindow></#macro>
<#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc
description confirmation><@renderField description /></#macro>
-<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc title
targetParameters alternate linkUrl targetWindow description confirmation
uniqueItemName="" height="" width="" id=""><@renderField description /></#macro>
+<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc title
targetParameters alternate linkUrl targetWindow description confirmation
uniqueItemName="" height="" width="" id=""><@renderField description /></#macro>
\ No newline at end of file
