Author: bibryam
Date: Fri Feb 19 15:34:25 2010
New Revision: 911843
URL: http://svn.apache.org/viewvc?rev=911843&view=rev
Log:
Fixed calendar lookups in Temporal expressions screen.
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl?rev=911843&r1=911842&r2=911843&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
Fri Feb 19 15:34:25 2010
@@ -42,7 +42,7 @@
<tr>
<td class="label">${uiLabelMap.CommonTo}</td>
<td>
- <@DateField formName=currentForm fieldName="date2" fieldValue=toDate/>
+ <@DateField formName=formName fieldName="date2" fieldValue=toDate/>
</td>
</tr>
</#macro>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl?rev=911843&r1=911842&r2=911843&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
Fri Feb 19 15:34:25 2010
@@ -112,7 +112,7 @@
<hr/>
<@CreateForm "DAY_OF_WEEK_RANGE" DayOfWeekRange/>
<hr/>
- <@CreateForm "FREQUENCY" Frequency/>
+ <@CreateForm "FREQUENCY" CreateFrequency/>
<hr/>
<@CreateForm "HOUR_RANGE" HourOfDayRange/>
<hr/>
@@ -155,6 +155,10 @@
<@DateRange formName="DATE_RANGE"/>
</#macro>
+<#macro CreateFrequency>
+ <@Frequency formName="FREQUENCY"/>
+</#macro>
+
<#macro CreateExprAssocForm formName="" exprAssocType="">
<form name="${formName}" method="post"
action="<@ofbizUrl>createTemporalExpressionAssoc</@ofbizUrl>">
<input type="hidden" name="tempExprId"
value="${temporalExpression.tempExprId}"/>
