[ofbiz-framework] branch release22.01 updated: Fixed: dateRange1 is not valid fileds for the entity TemporalExpression (OFBIZ-12695) While fixing the issue reported under OFBIZ-7066 invalid fileds names was used. Reverted commit#1791791, will fix the orinal issue in next commit

[deepak]

This is an automated email from the ASF dual-hosted git repository.

deepak pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release22.01 by this push:
     new 2f04e384ac Fixed: dateRange1 is not valid fileds for the entity 
TemporalExpression (OFBIZ-12695) While fixing the issue reported under 
OFBIZ-7066 invalid fileds names was used. Reverted commit#1791791, will fix the 
orinal issue in next commit
2f04e384ac is described below

commit 2f04e384ac951defb00aa244aa7580b34bfc3dff
Author: Deepak Dixit <deepak.di...@hotwax.co>
AuthorDate: Mon Sep 26 11:17:40 2022 +0530

    Fixed: dateRange1 is not valid fileds for the entity TemporalExpression 
(OFBIZ-12695)
    While fixing the issue reported under OFBIZ-7066 invalid fileds names was 
used. Reverted commit#1791791, will fix the orinal issue in next commit
---
 framework/webtools/template/tempexpr/TempExprMacros.ftl | 6 +++---
 framework/webtools/template/tempexpr/TempExprMaint.ftl  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/webtools/template/tempexpr/TempExprMacros.ftl 
b/framework/webtools/template/tempexpr/TempExprMacros.ftl
index 039b26c832..3a5b01202a 100644
--- a/framework/webtools/template/tempexpr/TempExprMacros.ftl
+++ b/framework/webtools/template/tempexpr/TempExprMacros.ftl
@@ -36,13 +36,13 @@ your template file:
   <tr>
     <td class="label">${uiLabelMap.CommonFrom}</td>
     <td>
-      <@DateField formName=formName fieldName="dateRange1" 
fieldValue=fromDate/>
+      <@DateField formName=formName fieldName="date1" fieldValue=fromDate/>
     </td>
   </tr>
   <tr>
     <td class="label">${uiLabelMap.CommonTo}</td>
     <td>
-      <@DateField formName=formName fieldName="dateRange2" fieldValue=toDate/>
+      <@DateField formName=formName fieldName="date2" fieldValue=toDate/>
     </td>
   </tr>
 </#macro>
@@ -104,7 +104,7 @@ your template file:
   <tr>
     <td class="label">${uiLabelMap.CommonFrom}</td>
     <td>
-      <@DateField formName=formName fieldName="dateFreq1" fieldValue=fromDate/>
+      <@DateField formName=formName fieldName="date1" fieldValue=fromDate/>
     </td>
   </tr>
   <tr>
diff --git a/framework/webtools/template/tempexpr/TempExprMaint.ftl 
b/framework/webtools/template/tempexpr/TempExprMaint.ftl
index 4481c2ac45..a377066c36 100644
--- a/framework/webtools/template/tempexpr/TempExprMaint.ftl
+++ b/framework/webtools/template/tempexpr/TempExprMaint.ftl
@@ -46,7 +46,7 @@ under the License.
     </tr>
   </#if>
     <#if "DATE_RANGE" == temporalExpression.tempExprTypeId>
-      <@DateRange formName="updateExpression" 
fromDate=temporalExpression.dateRange1 toDate=temporalExpression.dateRange2/>
+      <@DateRange formName="updateExpression" 
fromDate=temporalExpression.date1 toDate=temporalExpression.date2/>
     <#elseif "DAY_IN_MONTH" == temporalExpression.tempExprTypeId>
       <@DayInMonth occurrence=temporalExpression.integer2 
day=temporalExpression.integer1/>
     <#elseif "DAY_OF_MONTH_RANGE" == temporalExpression.tempExprTypeId>
@@ -54,7 +54,7 @@ under the License.
     <#elseif "DAY_OF_WEEK_RANGE" == temporalExpression.tempExprTypeId>
       <@DayOfWeekRange fromDay=temporalExpression.integer1 
toDay=temporalExpression.integer2/>
     <#elseif "FREQUENCY" == temporalExpression.tempExprTypeId>
-      <@Frequency formName="updateExpression" 
fromDate=temporalExpression.dateFreq1 freqType=temporalExpression.integer1 
freqValue=temporalExpression.integer2/>
+      <@Frequency formName="updateExpression" 
fromDate=temporalExpression.date1 freqType=temporalExpression.integer1 
freqValue=temporalExpression.integer2/>
     <#elseif "DAY_OF_WEEK_RANGE" == temporalExpression.tempExprTypeId>
       <@DayOfWeekRange fromDay=temporalExpression.integer1 
toDay=temporalExpression.integer2/>
     <#elseif "HOUR_RANGE" == temporalExpression.tempExprTypeId>