Author: jleroux
Date: Fri Jan 11 01:10:25 2008
New Revision: 611117
URL:
http://svn.apache.org/viewvc?rev=611117&view=revLog:
Applied fix from trunk for revision: 610083
Modified:
ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=611117&r1=611116&r2=611117&view=diff==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Fri Jan 11 01:10:25 2008
@@ -78,13 +78,13 @@
<tr>
<#if !orderItem.productId?exists || orderItem.productId == "_?_">
<td valign="top">
- <b><div class="tabletext"> >> ${orderItem.itemDescription}</div></b>
+ <b><div class="tabletext"> >> ${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>