[OFBiz] SVN: r6501 - in trunk/applications/product: webapp/catalog/product widget/catalog

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-01-14 14:41:56 -0600 (Sat, 14 Jan 2006)
New Revision: 6501

Modified:
   trunk/applications/product/webapp/catalog/product/ProductForms.xml
   trunk/applications/product/widget/catalog/ProductScreens.xml
Log:
Appled patch from Si Chen with example use of some new form widget features; Jira #OFBIZ-655

Modified: trunk/applications/product/webapp/catalog/product/ProductForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/product/ProductForms.xml	2006-01-14 20:40:53 UTC (rev 6500)
+++ trunk/applications/product/webapp/catalog/product/ProductForms.xml	2006-01-14 20:41:56 UTC (rev 6501)
@@ -569,20 +569,29 @@
         <field use-when="supplierProduct == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field use-when="supplierProduct != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="UpdateSupplierProduct" type="list" default-service-name="updateSupplierProduct"
+    <form name="ListSupplierProducts" type="list" 
             target="updateSupplierProduct" title="" list-name="productSuppliers"
-            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+            default-title-style="boxhead" default-widget-style="tabletext" default-tooltip-style="tabletext"
+            default-table-style="boxoutside" even-row-style="viewManyTR2" odd-row-style="viewManyTR1"
+            header-row-style="boxtop">
         <!--<auto-fields-service service-name="updateSupplierProduct"/>-->
 
-        <field name="partyId" title="${uiLabelMap.CommonPartyId}" widget-style="tabletext">
+        <field name="partyId" title="${uiLabelMap.CommonPartyId}" widget-style="tabletext"
+            header-link="EditProductSuppliers?productId=${productId}&amp;orderBy=partyId" header-link-style="buttontext">
             <display-entity entity-name="PartyNameView" also-hidden="true" description="${firstName} ${middleName} ${lastName} ${groupName}">
                 <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/>
             </display-entity>
         </field>
         <field name="supplierProductId"><display/></field>
-        <field name="minimumOrderQuantity" title="${uiLabelMap.ProductMinimumOrderQuantity}" widget-area-style="tabletextright"><display/></field>
+        <field name="minimumOrderQuantity" title="${uiLabelMap.ProductMinimumOrderQuantity}" widget-area-style="tabletextright"
+            header-link="EditProductSuppliers?productId=${productId}&amp;orderBy=minimumOrderQuantity" header-link-style="buttontext">
+                <display/>
+        </field>
         <field name="quantityUomId"><display/></field>
-        <field name="lastPrice" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field>
+        <field name="lastPrice" widget-area-style="tabletextright"
+            header-link="EditProductSuppliers?productId=${productId}&amp;orderBy=lastPrice"  header-link-style="buttontext">
+                <display type="currency" currency="${currencyUomId}"/>
+        </field>
         <field name="updateLink" title=" " widget-style="buttontext">
             <hyperlink target="EditProductSuppliers?productId=${productId}&amp;partyId=${partyId}&amp;currencyUomId=${currencyUomId}&amp;minimumOrderQuantity=${minimumOrderQuantity}"
                 description="${uiLabelMap.CommonUpdate}" also-hidden="false"/>

Modified: trunk/applications/product/widget/catalog/ProductScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/ProductScreens.xml	2006-01-14 20:40:53 UTC (rev 6500)
+++ trunk/applications/product/widget/catalog/ProductScreens.xml	2006-01-14 20:41:56 UTC (rev 6501)
@@ -591,16 +591,18 @@
                 <set field="defaultCurrencyUomId" value="USD"/>
 
                 <set field="productId" from-field="parameters.productId"/>
+                <set field="orderBy" from-field="parameters.orderBy" default-value="partyId"/>
                 <entity-one entity-name="Product" value-name="product"/>
                 <entity-and entity-name="SupplierProduct" list-name="productSuppliers">
                     <field-map field-name="productId"/>
+                    <order-by field-name="${orderBy}"/>
                 </entity-and>
                 <entity-one entity-name="SupplierProduct" value-name="supplierProduct" auto-field-map="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProductDecorator">
                     <decorator-section name="body">
-                        <include-form name="UpdateSupplierProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                        <include-form name="ListSupplierProducts" location="component://product/webapp/catalog/product/ProductForms.xml"/>
                         <section>
                             <condition><not><if-empty field-name="supplierProduct"/></not></condition>
                             <widgets><link target="EditProductSuppliers?productId=${productId}" style="buttontext" text="[New Product Supplier]"/></widgets>