Author: ashish
Date: Wed Jun 15 09:58:24 2016
New Revision: 1748534
URL: http://svn.apache.org/viewvc?rev=1748534&view=rev
Log:
Applied bug fix from trunk r1748532.
==============================================
Applied patch from jira issue - OFBIZ-7277 - Date time field is not working
properly in case of multiple parent category rollup.
Thanks Ravi for the contribution!
Modified:
ofbiz/branches/release14.12/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
Modified:
ofbiz/branches/release14.12/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=1748534&r1=1748533&r2=1748534&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
(original)
+++
ofbiz/branches/release14.12/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
Wed Jun 15 09:58:24 2016
@@ -72,7 +72,7 @@ under the License.
<input type="hidden"
name="productCategoryId${suffix}"
value="${productCategoryRollup.productCategoryId}" />
<input type="hidden"
name="parentProductCategoryId${suffix}"
value="${productCategoryRollup.parentProductCategoryId}" />
<input type="hidden" name="fromDate${suffix}"
value="${productCategoryRollup.fromDate}" />
- <@htmlTemplate.renderDateTimeField
name="thruDate${suffix}" event="" action="" className="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS"
value="${productCategoryRollup.thruDate!''}" size="25" maxlength="30"
id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField
name="thruDate${suffix}" event="" action="" className="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS"
value="${productCategoryRollup.thruDate!''}" size="25" maxlength="30"
id="thruDate${suffix}" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
<input type="text" size="5"
name="sequenceNum${suffix}" value="${productCategoryRollup.sequenceNum!}" />
</td>
<td>
