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/16 14:10:32 UTC
svn commit: r1049967 -
/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
Author: jleroux
Date: Thu Dec 16 13:10:32 2010
New Revision: 1049967
URL: http://svn.apache.org/viewvc?rev=1049967&view=rev
Log:
Fix a bug reported by Jonatan Soto on user ML
Modified:
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=1049967&r1=1049966&r2=1049967&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Thu Dec 16 13:10:32 2010
@@ -141,7 +141,13 @@ under the License.
<td> </td>
<td width="74%">
<div>
- <@htmlTemplate.renderDateTimeField name="THRU_DATE" event="" action="" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}"</#if> className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate1" 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("THRU_DATE"))?if_exists>
+ </#if>
+ <@htmlTemplate.renderDateTimeField name="THRU_DATE" event="" action="" value="${value}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </div>
</div>
</td>
</tr>