svn commit: r953964 - /ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl

[jleroux]

Author: jleroux
Date: Sat Jun 12 09:02:36 2010
New Revision: 953964

URL: http://svn.apache.org/viewvc?rev=953964&view=rev
Log:
A patch from Sascha Rodekamp "Add a Uom Description to the Product Feature 
Table" (https://issues.apache.org/jira/browse/OFBIZ-3818) - OFBIZ-3818

URL : https://localhost:8443/catalog/control/EditProductFeatures

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

Modified: 
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=953964&r1=953963&r2=953964&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl 
(original)
+++ 
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl 
Sat Jun 12 09:02:36 2010
@@ -30,6 +30,7 @@ under the License.
         <tr class="header-row">
           <td><b>${uiLabelMap.CommonId}</b></td>
           <td><b>${uiLabelMap.CommonDescription}</b></td>
+          <td><b>${uiLabelMap.ProductUomId}</b></td>
           <td><b>${uiLabelMap.ProductType}</b></td>
           <td><b>${uiLabelMap.ProductCategory}</b></td>
           <td><b>${uiLabelMap.CommonFromDate}</b></td>
@@ -38,6 +39,9 @@ under the License.
         </tr>
   <#assign rowClass = "2">
   <#list productFeatureAndAppls as productFeatureAndAppl>
+    <#if productFeatureAndAppl.uomId?exists>
+        <#assign curProductFeatureUom = 
delegator.findOne("Uom",{"uomId",productFeatureAndAppl.uomId}, true)>
+    </#if>
     <#assign curProductFeatureType = 
productFeatureAndAppl.getRelatedOneCache("ProductFeatureType")>
     <#assign curProductFeatureApplType = 
productFeatureAndAppl.getRelatedOneCache("ProductFeatureApplType")>
     <#assign curProductFeatureCategory = 
(productFeatureAndAppl.getRelatedOneCache("ProductFeatureCategory")?if_exists)>
@@ -49,6 +53,7 @@ under the License.
           <a 
href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}</@ofbizUrl>"
 class="buttontext">
               ${(productFeatureAndAppl.productFeatureId)?if_exists}</a></td>
           
<td>${(productFeatureAndAppl.get("description",locale))?if_exists}</td>
+          <td><#if 
productFeatureAndAppl.uomId?exists>${curProductFeatureUom.abbreviation!}</#if></td>
           
<td>${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}</td>
           <td><a 
href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}&amp;productId=${(productFeatureAndAppl.productId)?if_exists}</@ofbizUrl>"
 class="buttontext">
               ${(curProductFeatureCategory.description)?if_exists}