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 194d1c287 Revert "Fixed: dateType parameter not existing in
"renderDateTimeField" Macro (OFBIZ-13039)"
194d1c287 is described below
commit 194d1c287ed56666be696f4fb5b33396278eae12
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Jun 14 18:48:47 2024 +0200
Revert "Fixed: dateType parameter not existing in "renderDateTimeField"
Macro (OFBIZ-13039)"
This reverts commits
0362c1917cf7f8d68c5b73e30ad1be0efbbfac90.
7a709d6de39e8fdd6f5c374fecd2fc3945647797
c223de1a4dfae4fdd3702d765ebfef9fe887e6b7
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
---
ecommerce/template/catalog/ProductDetail.ftl | 8 ++++----
ecommerce/template/shoppinglist/EditShoppingList.ftl | 4 ++--
projectmgr/template/project/EditTaskAndAssoc.ftl | 16 ++++++++--------
projectmgr/template/survey/ListSurveys.ftl | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ecommerce/template/catalog/ProductDetail.ftl
b/ecommerce/template/catalog/ProductDetail.ftl
index 6e6e90527..ba9de9cd0 100644
--- a/ecommerce/template/catalog/ProductDetail.ftl
+++ b/ecommerce/template/catalog/ProductDetail.ftl
@@ -252,7 +252,7 @@ ${virtualVariantJavaScript!}
block2.style.display = "none";
}
</#if>
-
+
$(function(){
$('a[id^=productTag_]').click(function(){
var id = $(this).attr('id');
@@ -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" isDateType=true shortDateInput=true
timeDropdownParamName=""
+ id="reservStart1" dateType="date" 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" isDateType=true shortDateInput=false
timeDropdownParamName=""
+ id="reservStartStr" dateType="date" 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" isDateType=true shortDateInput=false
timeDropdownParamName=""
+ id="reservStartStr" dateType="date" 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 e397b8158..8a7a4102d 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" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSel [...]
+ <@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" dateType="date" 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" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" a [...]
+ <@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" dateType="date" 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 a75cf48e1..127ba0e7f 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" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSe
[...]
+ <@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" dateType="date" 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"
isDateType=true shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" [...]
+ <@htmlTemplate.renderDateTimeField name="estimatedStartDate"
className="" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate1"
dateType="date" 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" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" am [...]
+ <@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" dateType="date" 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" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compos [...]
+ <@htmlTemplate.renderDateTimeField
name="estimatedCompletionDate" className="" event="" action="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30"
id="estimatedCompletionDate1" dateType="date" 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" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected=" [...]
+ <@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" dateType="date" 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"
isDateType=true shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formN [...]
+ <@htmlTemplate.renderDateTimeField name="actualStartDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualStartDate1"
dateType="date" 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" isDateType=true shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected= [...]
+ <@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" dateType="date" 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"
isDateType=true shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeTyp [...]
+ <@htmlTemplate.renderDateTimeField name="actualCompletionDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualCompletionDate2"
dateType="date" 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 6ec73acf5..49abce2f1 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}" isDateType=true
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmNam [...]
+ <@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}" dateType="date"
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??>
