Author: deepak
Date: Fri May 27 06:17:10 2016
New Revision: 1745714
URL: http://svn.apache.org/viewvc?rev=1745714&view=rev
Log:
(OFBIZ-7134) Manually merged r#1745713
=======================================================
Added existence check to fix stack trace on return links ftl.
=======================================================
Modified:
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnLinks.ftl
Modified:
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnLinks.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnLinks.ftl?rev=1745714&r1=1745713&r2=1745714&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnLinks.ftl
(original)
+++
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnLinks.ftl
Fri May 27 06:17:10 2016
@@ -52,9 +52,9 @@ under the License.
<#if shipGroup?? && shipGroup.shipmentMethodTypeId !=
"NO_SHIPPING">
<#assign shipGroupShipment =
Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Shipment",
{"primaryOrderId" : shipGroup.orderId, "primaryShipGroupSeqId" :
shipGroup.shipGroupSeqId}, null, false))/>
<#if shipGroupShipment??>
- <#assign shipmentRouteSegment =
Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment",
{"shipmentId" : shipGroupShipment.shipmentId}, null, false))>
+ <#assign shipmentRouteSegment =
Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment",
{"shipmentId" : shipGroupShipment.shipmentId}, null, false))!>
<#if shipmentRouteSegment??>
- <#if "UPS" == shipmentRouteSegment.carrierPartyId>
+ <#if "UPS" == shipmentRouteSegment.carrierPartyId!>
<li><a
href="javascript:document.upsEmailReturnLabel.submit();"
class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a></li>
<li><form name="upsEmailReturnLabel" method="post"
action="<@ofbizUrl>upsEmailReturnLabelReturn</@ofbizUrl>">
<input type="hidden" name="returnId"
value="${returnId}"/>
