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 35b4b89f28 Fixed: dateType parameter not existing in
"renderDateTimeField" Macro (OFBIZ-13039)
35b4b89f28 is described below
commit 35b4b89f285d92445d6ade017c72b20fa4aa0a89
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri May 10 18:33:42 2024 +0200
Fixed: dateType parameter not existing in "renderDateTimeField" Macro
(OFBIZ-13039)
This replaces dateType="date" by isDateType=true in "renderDateTimeField"
Macro in CommonMacros.ftl
isDateType=true was put in with OFBIZ-12126 but then not changed in this
template
Conflicts handled by hand
---
themes/common-theme/template/includes/CommonMacros.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/common-theme/template/includes/CommonMacros.ftl
b/themes/common-theme/template/includes/CommonMacros.ftl
index 4548c8d227..d5b0919168 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" dateType="date"
shortDateInput=false timeDropdownParamName=""
+ size="25" maxlength="30" id="${fieldName}1" isDateType=true
shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown=""
timeHourName="" classString=""
hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
