svn commit: r1791791 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr: TempExprMacros.ftl TempExprMaint.ftl

Author: jleroux
Date: Tue Apr 18 14:46:40 2017
New Revision: 1791791

URL: http://svn.apache.org/viewvc?rev=1791791&view=rev
Log:
Fixed: temporal expression screen missing date dialogbox
(OFBIZ-7066)

Problem:
go to https://localhost:8443/webtools/control/editTemporalExpression
go to frequency expression section
notice date dialog button is missing

Explanation:
Same Id used by 2 macros

Solution:
Set different Ids in macros and use them in template

jleroux: I set clear different ids based on macros names

Thanks: Wai for report Florian Montalbano for investigation

Modified:
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl
    ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl?rev=1791791&r1=1791790&r2=1791791&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl Tue Apr 18 14:46:40 2017
@@ -36,13 +36,13 @@ your template file:
   <tr>
     <td class="label">${uiLabelMap.CommonFrom}</td>
     <td>
-      <@DateField formName=formName fieldName="date1" fieldValue=fromDate/>
+      <@DateField formName=formName fieldName="dateRange1" fieldValue=fromDate/>
     </td>
   </tr>
   <tr>
     <td class="label">${uiLabelMap.CommonTo}</td>
     <td>
-      <@DateField formName=formName fieldName="date2" fieldValue=toDate/>
+      <@DateField formName=formName fieldName="dateRange2" fieldValue=toDate/>
     </td>
   </tr>
 </#macro>
@@ -104,7 +104,7 @@ your template file:
   <tr>
     <td class="label">${uiLabelMap.CommonFrom}</td>
     <td>
-      <@DateField formName=formName fieldName="date1" fieldValue=fromDate/>
+      <@DateField formName=formName fieldName="dateFreq1" fieldValue=fromDate/>
     </td>
   </tr>
   <tr>

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl?rev=1791791&r1=1791790&r2=1791791&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl Tue Apr 18 14:46:40 2017
@@ -46,7 +46,7 @@ under the License.
     </tr>
   </#if>
     <#if temporalExpression.tempExprTypeId == "DATE_RANGE">
-      <@DateRange formName="updateExpression" fromDate=temporalExpression.date1 toDate=temporalExpression.date2/>
+      <@DateRange formName="updateExpression" fromDate=temporalExpression.dateRange1 toDate=temporalExpression.dateRange2/>
     <#elseif temporalExpression.tempExprTypeId == "DAY_IN_MONTH">
       <@DayInMonth occurrence=temporalExpression.integer2 day=temporalExpression.integer1/>
     <#elseif temporalExpression.tempExprTypeId == "DAY_OF_MONTH_RANGE">
@@ -54,7 +54,7 @@ under the License.
     <#elseif temporalExpression.tempExprTypeId == "DAY_OF_WEEK_RANGE">
       <@DayOfWeekRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
     <#elseif temporalExpression.tempExprTypeId == "FREQUENCY">
-      <@Frequency formName="updateExpression" fromDate=temporalExpression.date1 freqType=temporalExpression.integer1 freqValue=temporalExpression.integer2/>
+      <@Frequency formName="updateExpression" fromDate=temporalExpression.dateFreq1 freqType=temporalExpression.integer1 freqValue=temporalExpression.integer2/>
     <#elseif temporalExpression.tempExprTypeId == "DAY_OF_WEEK_RANGE">
       <@DayOfWeekRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
     <#elseif temporalExpression.tempExprTypeId == "HOUR_RANGE">