You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/12/17 09:02:47 UTC
svn commit: r1050305 -
/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
Author: jleroux
Date: Fri Dec 17 08:02:47 2010
New Revision: 1050305
URL: http://svn.apache.org/viewvc?rev=1050305&view=rev
Log:
Fix a bug introduced with jQuery merge (<#if inside <@htmlTemplate.renderDateTimeField). I checked, it was the only one remaining
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=1050305&r1=1050304&r2=1050305&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Fri Dec 17 08:02:47 2010
@@ -158,7 +158,12 @@ function lookupBom() {
<td width="26%" align="right">${uiLabelMap.CommonThruDate}</td>
<td> </td>
<td width="74%">
- <@htmlTemplate.renderDateTimeField name="thruDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("thruDate"))?if_exists}"</#if> size="30" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <#if useValues>
+ <#assign value= productAssoc.thruDate?if_exists>
+ <#else>
+ <#assign value= request.getParameter("thruDate")?if_exists>
+ </#if>
+ <@htmlTemplate.renderDateTimeField value="${value}" name="thruDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="30" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
</tr>
<tr>