Author: jleroux Date: Tue Nov 5 22:03:25 2013 New Revision: 1539150 URL: http://svn.apache.org/r1539150 Log: "Applied fix from trunk for revision: 1539147" ------------------------------------------------------------------------ r1539147 | jleroux | 2013-11-05 22:58:46 +0100 (mar. 05 nov. 2013) | 13 lignes
A patch from Christian Carlow for "Additional ship group renderDateFields not created" https://issues.apache.org/jira/browse/OFBIZ-OFBIZ-5382 - OFBIZ-5382 ShipBeforeDate/ShipAfterDate fields are not created as renderDateFields for additional ship groups on orderview page. The problem is that additional ship groups share the same id as the first ship group date fields. The javascript renderDateField logic requires unique ids the all fields that are supposed to be created by renderDateField. To reproduce: 1. Create an order for DemoCustCompany 2. Add 10 GZ-BASKET products to the order and click "Finalize Order" 3. Add an additional ship group and click "Continue" 4. Assign 5 of GZ-BASKET to second ship group and click "Continue" 5. Complete the remaining steps required to complete the order 6. On the page after the "Create Order" link is clicked, notice the date fields of the second ship group were not rendered with a calendar. ------------------------------------------------------------------------ Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1539147 Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1539150&r1=1539149&r2=1539150&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Nov 5 22:03:25 2013 @@ -557,9 +557,9 @@ under the License. <form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <br/> - <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="submit" value="${uiLabelMap.CommonUpdate}"/> </form> </td>
