svn commit: r610083 - /ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl

[sichen]

Author: sichen
Date: Tue Jan  8 09:49:49 2008
New Revision: 610083

URL: http://svn.apache.org/viewvc?rev=610083&view=rev
Log:
prevent NPE if order item has no item description

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=610083&r1=610082&r2=610083&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Tue Jan  8 09:49:49 2008
@@ -78,13 +78,13 @@
             <tr>
               <#if !orderItem.productId?exists || orderItem.productId == "_?_">
                 <td valign="top">
-                  <b><div class="tabletext"> &gt;&gt; ${orderItem.itemDescription}</div></b>
+                  <b><div class="tabletext"> &gt;&gt; ${orderItem.itemDescription?default("")}</div></b>
                 </td>
               <#else>
                 <#assign product = orderItem.getRelatedOneCache("Product")?if_exists/> <#-- should always exist because of FK constraint, but just in case -->
                 <td valign="top">
                   <div class="tabletext">
-                    <a href="<@ofbizUrl>product?product_id=${orderItem.productId}</@ofbizUrl>" class="linktext">${orderItem.productId} - ${orderItem.itemDescription}</a>
+                    <a href="<@ofbizUrl>product?product_id=${orderItem.productId}</@ofbizUrl>" class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a>
                   </div>
                   <div class="tabletext" style="font-size: xx-small;">
                     <#if product?has_content>