(ofbiz-plugins) branch release18.12 updated: Fixed: dateType parameter not existing in "renderDateTimeField" Macro (OFBIZ-13039)
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
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!}
<@htmlTemplate.renderDateTimeField event="" action=""
name="reservStart" className="" alert=""
title="Format: -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}(-mm-dd)
<@htmlTemplate.renderDateTimeField name="reservStartStr"
event="" action="" value="${startDate}"
className="" alert="" title="Format: -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
ofdays
@@ -820,7 +820,7 @@ ${variantInfoJavaScript!}
${uiLabelMap.CommonStartDate}(-mm-dd)
<@htmlTemplate.renderDateTimeField name="reservStartStr"
event="" action="" value="${startDate}"
className="" alert="" title="Format: -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
ofdays
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.
${uiLabelMap.CommonStartDate}
- <@htmlTemplate.renderDateTimeField name="startDateTime"
className="form-control" event="" action="" alert="" title="Format: -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=""
(ofbiz-plugins) branch release18.12 updated: Fixed: dateType parameter not existing in "renderDateTimeField" Macro (OFBIZ-13039)
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 0362c1917 Fixed: dateType parameter not existing in
"renderDateTimeField" Macro (OFBIZ-13039)
0362c1917 is described below
commit 0362c1917cf7f8d68c5b73e30ad1be0efbbfac90
Author: Jacques Le Roux
AuthorDate: Thu Apr 18 16:33:57 2024 +0200
Fixed: dateType parameter not existing in "renderDateTimeField" Macro
(OFBIZ-13039)
Removes dateType parameter from "renderDateTimeField" Macro in
ProductDetail.ftl
EditShoppingList.ftl
EditTaskAndAssoc.ftl
ListSurveys.ftl
---
ecommerce/template/catalog/ProductDetail.ftl | 4 ++--
ecommerce/template/shoppinglist/EditShoppingList.ftl | 4 ++--
projectmgr/template/project/EditTaskAndAssoc.ftl | 16
projectmgr/template/survey/ListSurveys.ftl | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ecommerce/template/catalog/ProductDetail.ftl
b/ecommerce/template/catalog/ProductDetail.ftl
index ba9de9cd0..b998719d1 100644
--- a/ecommerce/template/catalog/ProductDetail.ftl
+++ b/ecommerce/template/catalog/ProductDetail.ftl
@@ -252,7 +252,7 @@ ${virtualVariantJavaScript!}
block2.style.display = "none";
}
-
+
$(function(){
$('a[id^=productTag_]').click(function(){
var id = $(this).attr('id');
@@ -726,7 +726,7 @@ ${variantInfoJavaScript!}
<@htmlTemplate.renderDateTimeField event="" action=""
name="reservStart" className="" alert=""
title="Format: -MM-dd HH:mm:ss.SSS"
value="${startDate}" size="25" maxlength="30"
-id="reservStart1" dateType="date" shortDateInput=true
timeDropdownParamName=""
+id="reservStart1" shortDateInput=true
timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString=""
hour1="" hour2="" timeMinutesName="" minutes=""
isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
diff --git a/ecommerce/template/shoppinglist/EditShoppingList.ftl
b/ecommerce/template/shoppinglist/EditShoppingList.ftl
index 8a7a4102d..941a92c9f 100644
--- a/ecommerce/template/shoppinglist/EditShoppingList.ftl
+++ b/ecommerce/template/shoppinglist/EditShoppingList.ftl
@@ -253,13 +253,13 @@ under the License.
${uiLabelMap.CommonStartDate}
- <@htmlTemplate.renderDateTimeField name="startDateTime"
className="form-control" event="" action="" alert="" title="Format: -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 [...]
+ <@htmlTemplate.renderDateTimeField name="startDateTime"
className="form-control" event="" action="" alert="" title="Format: -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
[...]
${uiLabelMap.CommonEndDate}
- <@htmlTemplate.renderDateTimeField name="endDateTime"
className="textBox form-control" event="" action="" alert="" title="Format:
-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 [...]
+ <@htmlTemplate.renderDateTimeField name="endDateTime"
className="textBox form-control" event="" action="" alert="" title="Format:
-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 [...]
diff --git a/projectmgr/template/project/EditTaskAndAssoc.ftl
