svn commit: r956201 - in /ofbiz/trunk/applications/product/widget/catalog: ProductForms.xml ProductScreens.xml

Author: jleroux
Date: Sat Jun 19 09:10:33 2010
New Revision: 956201

URL: http://svn.apache.org/viewvc?rev=956201&view=rev
Log:
A patch from Eric De Maulde "Product Categories page without category name" (https://issues.apache.org/jira/browse/OFBIZ-3826) - OFBIZ-3826

Into the form UpdateProductCategoryMemeber (Product Categories page) categoryId appears twice if category description is empty, but category name is more significant and always full.
Also the form name has an error.

Into UpdateProductCategoryMemeber form, this patch changes category description to category name. It corrects the form name to UpdateProductCategoryMember

Modified:
    ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=956201&r1=956200&r2=956201&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Jun 19 09:10:33 2010
@@ -493,12 +493,12 @@ under the License.
         <field name="comments" ><textarea/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="UpdateProductCategoryMemeber" type="list" target="updateProductToCategory" title="" list-name="productCategoryMembers"
+    <form name="UpdateProductCategoryMember" type="list" target="updateProductToCategory" title="" list-name="productCategoryMembers"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateProductToCategory"/>
         <field name="productId"><hidden/></field>
         <field name="productCategoryId" title="${uiLabelMap.ProductCategory_Id}">
-            <display-entity entity-name="ProductCategory" also-hidden="true" description="${description}">
+            <display-entity entity-name="ProductCategory" also-hidden="true" description="${categoryName}">
                 <sub-hyperlink target="EditCategory" description="${productCategoryId}" link-style="buttontext"><parameter param-name="productCategoryId"/></sub-hyperlink>
             </display-entity>
         </field>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=956201&r1=956200&r2=956201&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sat Jun 19 09:10:33 2010
@@ -181,7 +181,7 @@ under the License.
                 <decorator-screen name="CommonProductDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleEditProductCategories}">
-                            <include-form name="UpdateProductCategoryMemeber" location="component://product/widget/catalog/ProductForms.xml"/>
+                            <include-form name="UpdateProductCategoryMember" location="component://product/widget/catalog/ProductForms.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.PageTitleAddProductCategories}">
                             <include-form name="AddProductCategoryMember" location="component://product/widget/catalog/ProductForms.xml"/>