Author: jleroux Date: Sat May 19 10:06:45 2012 New Revision: 1340401 URL: http://svn.apache.org/viewvc?rev=1340401&view=rev Log: "Applied fix from trunk for revision: 1340400 " ------------------------------------------------------------------------ r1340400 | jleroux | 2012-05-19 12:05:33 +0200 (sam., 19 mai 2012) | 3 lines
A patch from Sebastian Leitner for "Possible Freemarker error in ordershippinginfo.ftl" https://issues.apache.org/jira/browse/OFBIZ-4881 If the shipgroup does not have a carrierPartyId (which is the case, if an order does not need shipping and its shipping method is NA), there is an FTL-error. ------------------------------------------------------------------------ Modified: ofbiz/branches/release12.04/ (props changed) ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Propchange: ofbiz/branches/release12.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1340400 Modified: ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1340401&r1=1340400&r2=1340401&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sat May 19 10:06:45 2012 @@ -252,7 +252,7 @@ under the License. --> <select name="shipmentMethod"> <#if shipGroup.shipmentMethodTypeId?has_content> - <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option> + <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option> <#else> <option value=""/> </#if>
