Author: lektran
Date: Sat Nov 14 22:42:49 2009
New Revision: 836280
URL: http://svn.apache.org/viewvc?rev=836280&view=rev
Log:
Fixed defaults for missing values when displaying Find Shipment results
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=836280&r1=836279&r2=836280&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
(original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
Sat Nov 14 22:42:49 2009
@@ -182,12 +182,12 @@
<#list shipmentList as shipment>
<#assign originFacility =
shipment.getRelatedOneCache("OriginFacility")?if_exists>
<#assign destinationFacility =
shipment.getRelatedOneCache("DestinationFacility")?if_exists>
- <#assign statusItem = shipment.getRelatedOneCache("StatusItem")>
+ <#assign statusItem =
shipment.getRelatedOneCache("StatusItem")?if_exists>
<#assign shipmentType =
shipment.getRelatedOneCache("ShipmentType")?if_exists>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td><a
href="<@ofbizUrl>ViewShipment?shipmentId=${shipment.shipmentId}</@ofbizUrl>"
class="buttontext">${shipment.shipmentId}</a></td>
-
<td>${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</td>
-
<td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td>
+
<td>${(shipmentType.get("description",locale))?default(shipmentType.shipmentTypeId?default(""))}</td>
+
<td>${(statusItem.get("description",locale))?default(statusItem.statusId?default("N/A"))}</td>
<td>${(originFacility.facilityName)?if_exists}
[${shipment.originFacilityId?if_exists}]</td>
<td>${(destinationFacility.facilityName)?if_exists}
[${shipment.destinationFacilityId?if_exists}]</td>
<td><span style="white-space:
nowrap;">${(shipment.estimatedShipDate.toString())?if_exists}</span></td>
