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

[jacopoc]

Author: jacopoc
Date: Fri Mar 30 06:07:20 2007
New Revision: 524066

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

Removed:
    ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFacilityLocations.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=524066&r1=524065&r2=524066
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Fri Mar 30 06:07:20 2007
@@ -1266,4 +1266,44 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
+
+    <form name="UpdateProductFacilityLocations" type="list" target="updateProductFacilityLocation" title="" list-name="productFacilityLocations">
+        <row-actions>
+            <entity-one entity-name="FacilityLocation" value-name="facilityLocation">
+                <field-map field-name="facilityId"/>
+                <field-map field-name="locationSeqId"/>
+            </entity-one>
+            <entity-one entity-name="Enumeration" value-name="locationType">
+                <field-map field-name="enumId" env-name="facilityLocation.locationTypeEnumId"/>
+            </entity-one>
+        </row-actions>
+        <auto-fields-service service-name="updateProductFacilityLocation"/>
+        <field name="productId"><hidden/></field>
+        <field name="facilityId">
+            <display-entity entity-name="Facility" description="${facilityName} [${facilityId}]" also-hidden="true"/>
+        </field>
+        <field name="locationSeqId">
+            <display description="${facilityLocation.areaId} ${facilityLocation.aisleId} ${facilityLocation.sectionId} ${facilityLocation.levelId} ${facilityLocation.positionId} [${locationSeqId}] (${locationType.description})"/>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink target="deleteProductFacilityLocation?productId=${productId}&amp;facilityId=${facilityId}&amp;locationSeqId=${locationSeqId}"
+                description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>
+    <form name="AddProductFacilityLocation" target="createProductFacilityLocation" title="" type="single">
+        <auto-fields-service service-name="createProductFacilityLocation"/>
+        <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="locationSeqId">
+            <lookup target-form-name="LookupFacilityLocation"/>
+        </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=524066&r1=524065&r2=524066
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Fri Mar 30 06:07:20 2007
@@ -414,9 +414,9 @@
             <widgets>
                 <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/catalog/product/EditProductFacilityLocations.ftl"/></html>
-                        </platform-specific>
+                        <include-form name="UpdateProductFacilityLocations" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                        <container><label style="head2">${uiLabelMap.CommonAdd} ${uiLabelMap.ProductFacilityLocation}</label></container>
+                        <include-form name="AddProductFacilityLocation" location="component://product/webapp/catalog/product/ProductForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>