svn commit: r1032665 - in /ofbiz/trunk/applications/product/widget/catalog: ProductStoreForms.xml StoreScreens.xml

[buscob]

Author: buscob
Date: Mon Nov  8 18:50:44 2010
New Revision: 1032665

URL: http://svn.apache.org/viewvc?rev=1032665&view=rev
Log:
FindProductStore form is actually a *List*ProductStore form.
-Separated ID and name column
-added column sorting feature
-removed edit button since the edit form is normally accessed using the ID hyperlink

Modified:
    ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml?rev=1032665&r1=1032664&r2=1032665&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml Mon Nov  8 18:50:44 2010
@@ -20,20 +20,22 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="FindProductStore" type="list" list-name="productStores"
-        odd-row-style="alternate-row" default-table-style="basic-table">
-        <field name="ProductStoreNameId" title="${uiLabelMap.ProductStoreNameId}" widget-style="buttontext">
-            <hyperlink target="EditProductStore" description="${storeName} [${productStoreId}]">
-                <parameter param-name="productStoreId"/>
-            </hyperlink>
-        </field>
-        <field name="title" title="${uiLabelMap.ProductTitle}"><display/></field>
-        <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><display/></field>
-        <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="EditProductStore" description="${uiLabelMap.CommonEdit}">
+    <form name="ListProductStore" type="list" list-name="productStores"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <actions>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="storeName"/>
+            <entity-and entity-name="ProductStore" use-cache="true" list="productStores">
+                <order-by field-name="${parameters.sortField}"/>
+            </entity-and>
+        </actions>
+        <field name="productStoreId" title="${uiLabelMap.ProductStoreId}" widget-style="buttontext" sort-field="true">
+            <hyperlink target="EditProductStore" description="${productStoreId}">
                 <parameter param-name="productStoreId"/>
             </hyperlink>
         </field>
+        <field name="storeName" title="${uiLabelMap.ProductStoreName}" sort-field="true"><display/></field>
+        <field name="title" title="${uiLabelMap.ProductTitle}" sort-field="true"><display/></field>
+        <field name="subtitle" title="${uiLabelMap.ProductSubTitle}" sort-field="true"><display/></field>
     </form>
     <form name="EditProductStore" type="single" target="updateProductStore" title="" default-map-name="productStore"
         header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1032665&r1=1032664&r2=1032665&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Mon Nov  8 18:50:44 2010
@@ -27,10 +27,6 @@ under the License.
                 <set field="titleProperty" value="PageTitleEditProductStoreList"/>
                 <set field="headerItem" value="store"/>
                 <set field="tabButtonItem" value="EditProductStoreList"/>
-
-                <entity-condition entity-name="ProductStore" list="productStores">
-                    <order-by field-name="storeName"/>
-                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
@@ -39,7 +35,7 @@ under the License.
                             <container style="button-bar">
                                 <link target="EditProductStore" text="${uiLabelMap.ProductCreateNewProductStore}" style="buttontext create"/>
                             </container>
-                            <include-form name="FindProductStore" location="component://product/widget/catalog/ProductStoreForms.xml"/>
+                            <include-form name="ListProductStore" location="component://product/widget/catalog/ProductStoreForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>