svn commit: r524033 - in /ofbiz/trunk/applications/product: webapp/catalog/product/EditProductFacilities.ftl webapp/catalog/product/ProductForms.xml widget/catalog/ProductScreens.xml

[jacopoc]

Author: jacopoc
Date: Fri Mar 30 03:35:40 2007
New Revision: 524033

URL: http://svn.apache.org/viewvc?view=rev&rev=524033
Log:
Migrated product's Facilities subscreens to widgets.

Removed:
    ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFacilities.ftl
Modified:
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?view=diff&rev=524033&r1=524032&r2=524033
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Fri Mar 30 03:35:40 2007
@@ -1224,7 +1224,7 @@
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true">
                 <sub-hyperlink target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext" target-type="inter-app"/>
             </display-entity>
-        </field>        
+        </field>
         <field name="workEffortGoodStdTypeId" widget-style="tabletext"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field>
         <field name="productId" widget-style="tabletext"><hidden/></field>
         <field name="fromDate" widget-style="tabletext"><display/></field>
@@ -1242,4 +1242,28 @@
         </field>
     </form>
 
+    <form name="UpdateProductFacilities" type="list" target="updateProductFacility" title="" list-name="productFacilities">
+        <auto-fields-service service-name="updateProductFacility"/>
+        <field name="productId"><hidden/></field>
+        <field name="facilityId">
+            <display-entity entity-name="Facility" description="${facilityName} [${facilityId}]" also-hidden="true"/>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink target="deleteProductFacility?productId=${productId}&amp;facilityId=${facilityId}"
+                description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>
+    <form name="AddProductFacility" target="createProductFacility" title="" type="single">
+        <auto-fields-service service-name="createProductFacility"/>
+        <field name="productId"><hidden/></field>
+        <field name="facilityId">
+            <drop-down>
+                <entity-options entity-name="Facility" description="${facilityName}">
+                    <entity-order-by field-name="facilityName"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?view=diff&rev=524033&r1=524032&r2=524033
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Fri Mar 30 03:35:40 2007
@@ -384,9 +384,9 @@
             <widgets>
                 <decorator-screen name="CommonProductDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/catalog/product/EditProductFacilities.ftl"/></html>
-                        </platform-specific>
+                        <include-form name="UpdateProductFacilities" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                        <container><label style="head2">${uiLabelMap.ProductAddFacility}</label></container>
+                        <include-form name="AddProductFacility" location="component://product/webapp/catalog/product/ProductForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>