svn commit: r1791792 - in /ofbiz/branches/release16.11: ./ framework/webtools/template/tempexpr/TempExprMacros.ftl framework/webtools/template/tempexpr/TempExprMaint.ftl

Author: jleroux
Date: Tue Apr 18 14:47:48 2017
New Revision: 1791792

URL: http://svn.apache.org/viewvc?rev=1791792&view=rev
Log:
"Applied fix from trunk framework for revision: 1791791  "
------------------------------------------------------------------------
r1791791 | jleroux | 2017-04-18 16:46:40 +0200 (mar. 18 avr. 2017) | 17 lignes

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/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMacros.ftl
    ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMaint.ftl

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 18 14:47:48 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMacros.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMacros.ftl?rev=1791792&r1=1791791&r2=1791792&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMacros.ftl (original)
+++ ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMacros.ftl Tue Apr 18 14:47:48 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/branches/release16.11/framework/webtools/template/tempexpr/TempExprMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMaint.ftl?rev=1791792&r1=1791791&r2=1791792&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMaint.ftl (original)
+++ ofbiz/branches/release16.11/framework/webtools/template/tempexpr/TempExprMaint.ftl Tue Apr 18 14:47:48 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">