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-plugins.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 7a709d6de Fixed: dateType parameter not existing in
"renderDateTimeField" Macro (OFBIZ-13039)
7a709d6de is described below
commit 7a709d6de39e8fdd6f5c374fecd2fc3945647797
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri May 10 18:33:51 2024 +0200
Fixed: dateType parameter not existing in "renderDateTimeField" Macro
(OFBIZ-13039)
Previous commit (4de5d7bf7e3f077cc81bd1d62bb1848c83c9392b) was wrong. I put
back
dateType="date" parameter when isDateType=true should have been used.
It was put in with OFBIZ-12126 but then not changed in templates plugins
It also fixes commit ba1b753ef6d653e6e7aeeca4add330c627cabf91 of OFBIZ-7949
So this replaces dateType="date" by isDateType=true in "renderDateTimeField"
Macro in:
ProductDetail.ftl
EditShoppingList.ftl
EditTaskAndAssoc.ftl
ListSurveys.ftl
---
ecommerce/template/catalog/ProductDetail.ftl | 6 +++---
ecommerce/template/shoppinglist/EditShoppingList.ftl | 4 ++--
projectmgr/template/project/EditTaskAndAssoc.ftl | 16 ++++++++--------
projectmgr/template/survey/ListSurveys.ftl | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ecommerce/template/catalog/ProductDetail.ftl
b/ecommerce/template/catalog/ProductDetail.ftl
index a21523820..6e6e90527 100644
--- a/ecommerce/template/catalog/ProductDetail.ftl
+++ b/ecommerce/template/catalog/ProductDetail.ftl
@@ -726,7 +726,7 @@ ${variantInfoJavaScript!}
</label>
<@htmlTemplate.renderDateTimeField event="" action=""
name="reservStart" className="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS"
value="${startDate}" size="25" maxlength="30"
- id="reservStart1" dateType="date" shortDateInput=true
timeDropdownParamName=""
+ id="reservStart1" isDateType=true shortDateInput=true
timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString=""
hour1="" hour2="" timeMinutesName="" minutes=""
isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
@@ -808,7 +808,7 @@ ${variantInfoJavaScript!}
${uiLabelMap.CommonStartDate}(yyyy-mm-dd)
<@htmlTemplate.renderDateTimeField name="reservStartStr"
event="" action="" value="${startDate}"
className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" size="15" maxlength="30"
- id="reservStartStr" dateType="date" shortDateInput=false
timeDropdownParamName=""
+ id="reservStartStr" isDateType=true shortDateInput=false
timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected=""
compositeType="" formName=""/> Number
of days
@@ -820,7 +820,7 @@ ${variantInfoJavaScript!}
${uiLabelMap.CommonStartDate}(yyyy-mm-dd)
<@htmlTemplate.renderDateTimeField name="reservStartStr"
event="" action="" value="${startDate}"
className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" size="15" maxlength="30"
- id="reservStartStr" dateType="date" shortDateInput=false
timeDropdownParamName=""
+ id="reservStartStr" isDateType=true shortDateInput=false
timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected=""
compositeType="" formName=""/> Number
of days
diff --git a/ecommerce/template/shoppinglist/EditShoppingList.ftl
b/ecommerce/template/shoppinglist/EditShoppingList.ftl
index 941a92c9f..e397b8158 100644
--- a/ecommerce/template/shoppinglist/EditShoppingList.ftl
+++ b/ecommerce/template/shoppinglist/EditShoppingList.ftl
@@ -253,13 +253,13 @@ under the License.
<div class="row">
<div class="col-sm-6">
<label>${uiLabelMap.CommonStartDate}</label>
- <@htmlTemplate.renderDateTimeField name="startDateTime"
className="form-control" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(recurrenceInfo.startDateTime)!}" size="25"
maxlength="30" id="startDateTime1" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelec
[...]
+ <@htmlTemplate.renderDateTimeField name="startDateTime"
className="form-control" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(recurrenceInfo.startDateTime)!}" size="25"
maxlength="30" id="startDateTime1" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSel [...]
</div>
</div>
<div class="row">
<div class="col-sm-6">
<label>${uiLabelMap.CommonEndDate}</label>
- <@htmlTemplate.renderDateTimeField name="endDateTime"
className="textBox form-control" event="" action="" alert="" title="Format:
yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceRule.untilDateTime)!}" size="25"
maxlength="30" id="endDateTime1" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmS [...]
+ <@htmlTemplate.renderDateTimeField name="endDateTime"
className="textBox form-control" event="" action="" alert="" title="Format:
yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceRule.untilDateTime)!}" size="25"
maxlength="30" id="endDateTime1" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" a [...]
</div>
</div>
<div class="row">
diff --git a/projectmgr/template/project/EditTaskAndAssoc.ftl
b/projectmgr/template/project/EditTaskAndAssoc.ftl
index ea5dd9b7c..a75cf48e1 100644
--- a/projectmgr/template/project/EditTaskAndAssoc.ftl
+++ b/projectmgr/template/project/EditTaskAndAssoc.ftl
@@ -168,9 +168,9 @@ under the License.
<td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
<td>
<#if task??>
- <@htmlTemplate.renderDateTimeField name="estimatedStartDate"
className="" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.estimatedStartDate!}" size="25" maxlength="30"
id="estimatedStartDate1" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compos [...]
+ <@htmlTemplate.renderDateTimeField name="estimatedStartDate"
className="" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.estimatedStartDate!}" size="25" maxlength="30"
id="estimatedStartDate1" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSe
[...]
<#else>
- <@htmlTemplate.renderDateTimeField name="estimatedStartDate"
className="" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate1"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="estimatedStartDate"
className="" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate1"
isDateType=true shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" [...]
</#if>
</td>
</tr>
@@ -178,9 +178,9 @@ under the License.
<td
class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
<td>
<#if task??>
- <@htmlTemplate.renderDateTimeField
name="estimatedCompletionDate" className="" event="" action="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS"
value="${task.estimatedCompletionDate!}" size="25" maxlength="30"
id="estimatedCompletionDate1" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSe [...]
+ <@htmlTemplate.renderDateTimeField
name="estimatedCompletionDate" className="" event="" action="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS"
value="${task.estimatedCompletionDate!}" size="25" maxlength="30"
id="estimatedCompletionDate1" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" am [...]
<#else>
- <@htmlTemplate.renderDateTimeField
name="estimatedCompletionDate" className="" event="" action="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30"
id="estimatedCompletionDate1" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formN [...]
+ <@htmlTemplate.renderDateTimeField
name="estimatedCompletionDate" className="" event="" action="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30"
id="estimatedCompletionDate1" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compos [...]
</#if>
</td>
</tr>
@@ -190,9 +190,9 @@ under the License.
<#if task??>
- <@htmlTemplate.renderDateTimeField name="actualStartDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.actualStartDate!}" size="25" maxlength="30"
id="actualStartDate1" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType= [...]
+ <@htmlTemplate.renderDateTimeField name="actualStartDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.actualStartDate!}" size="25" maxlength="30"
id="actualStartDate1" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected=" [...]
<#else>
- <@htmlTemplate.renderDateTimeField name="actualStartDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualStartDate1"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="actualStartDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualStartDate1"
isDateType=true shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formN [...]
</#if>
</td>
</tr>
@@ -201,9 +201,9 @@ under the License.
<td>
<#if task??>
- <@htmlTemplate.renderDateTimeField name="actualCompletionDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.actualCompletionDate!}" size="25" maxlength="30"
id="actualCompletionDate2" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" [...]
+ <@htmlTemplate.renderDateTimeField name="actualCompletionDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.actualCompletionDate!}" size="25" maxlength="30"
id="actualCompletionDate2" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected= [...]
<#else>
- <@htmlTemplate.renderDateTimeField name="actualCompletionDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualCompletionDate2"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="actualCompletionDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualCompletionDate2"
isDateType=true shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeTyp [...]
</#if>
</td>
</tr>
diff --git a/projectmgr/template/survey/ListSurveys.ftl
b/projectmgr/template/survey/ListSurveys.ftl
index 372044b94..6ec73acf5 100644
--- a/projectmgr/template/survey/ListSurveys.ftl
+++ b/projectmgr/template/survey/ListSurveys.ftl
@@ -44,7 +44,7 @@ under the License.
<td><a
href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId!}"
class="buttontext">${workEffortSurveyAppl.surveyId!} -
${survey.surveyName!}</a></td>
<td>${workEffortSurveyAppl.fromDate!}</td>
<td>
- <@htmlTemplate.renderDateTimeField name="thruDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(workEffortSurveyAppl.thruDate)!}" size="25"
maxlength="30" id="thruDate_${workEffortSurveyAppl_index}" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected= [...]
+ <@htmlTemplate.renderDateTimeField name="thruDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(workEffortSurveyAppl.thruDate)!}" size="25"
maxlength="30" id="thruDate_${workEffortSurveyAppl_index}" isDateType=true
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmNam [...]
</td>
<td><a
href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId!}&workEffortId=${workEffortSurveyAppl.workEffortId!}</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td>
<#if !isReadable??>
