svn commit: r951367 - /ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl

Author: jleroux
Date: Fri Jun  4 11:12:20 2010
New Revision: 951367

URL: http://svn.apache.org/viewvc?rev=951367&view=rev
Log:
A patch from Sascha Rodekamp " FTL error when feature description is missing" (https://issues.apache.org/jira/browse/OFBIZ-3805) - OFBIZ-3805

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl?rev=951367&r1=951366&r2=951367&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl Fri Jun  4 11:12:20 2010
@@ -75,8 +75,8 @@ under the License.
     <tr id="productFeatureId_tableRow_${rowCount}"  valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
         <input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" />
         <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${productFeature.productFeatureId}</@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
-        <td>${productFeature.description}</td>
-        <td><#if curProductFeatureType?exists>${curProductFeatureType.description}<#else> [${productFeature.productFeatureTypeId}]</#if></td>
+        <td>${productFeature.description!}</td>
+        <td><#if curProductFeatureType?exists>${curProductFeatureType.description!}<#else> [${productFeature.productFeatureTypeId}]</#if></td>
         <td>
           <select name="productFeatureApplTypeId_o_${rowCount}" size="1">
             <#list productFeatureApplTypes as productFeatureApplType>