You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2007/03/07 07:31:30 UTC

svn commit: r515474 - in /ofbiz/trunk/applications/product: webapp/facility/WEB-INF/actions/facility/FindFacility.bsh webapp/facility/facility/FacilityForms.xml webapp/facility/facility/FindFacility.ftl widget/facility/FacilityScreens.xml

Author: lektran
Date: Tue Mar  6 22:31:29 2007
New Revision: 515474

URL: http://svn.apache.org/viewvc?view=rev&rev=515474
Log:
Converted FindFacility.ftl to a form widget and FindFacility.bsh to an entity-and

Removed:
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.bsh
    ofbiz/trunk/applications/product/webapp/facility/facility/FindFacility.ftl
Modified:
    ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?view=diff&rev=515474&r1=515473&r2=515474
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Tue Mar  6 22:31:29 2007
@@ -20,6 +20,21 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+    <form name="FindFacility" type="list" list-name="facilities">
+        <field name="facilityId" widget-style="buttontext">
+            <hyperlink target="EditFacility?facilityId=${facilityId}" description="${facilityId}"/>
+        </field>
+        <field name="facilityName"><display/></field>
+        <field name="facilityTypeId" title="${uiLabelMap.ProductFacilityType}">
+            <display-entity entity-name="FacilityType" description="${description}"/>
+        </field>
+        <field name="ownerPartyId" title="${uiLabelMap.ProductFacilityOwner}"><display/></field>
+        <field name="squareFootage" title="${uiLabelMap.ProductSqFt}"><display/></field>
+        <field name="description"><display/></field>
+        <field name="editLink" widget-style="buttontext">
+            <hyperlink target="EditFacility?facilityId=${facilityId}" description="${uiLabelMap.CommonEdit}"/>
+        </field>
+    </form>
     <form name="ListFacilityInventoryItems" type="list"  target="" title="" list-name="inventoryItems" 
         default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
         paginate-target="EditFacilityInventoryItems">

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=515474&r1=515473&r2=515474
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Tue Mar  6 22:31:29 2007
@@ -24,14 +24,16 @@
         <section>
             <actions>
                 <set field="headerItem" value="facility"/>
-                <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacility.bsh"/>
+                <entity-and list-name="facilities" entity-name="Facility"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/facility/facility/FindFacility.ftl"/></html>
-                        </platform-specific>
+                        <label style="head1">${uiLabelMap.ProductFacilitiesList}</label>
+                        <container>
+                            <link style="buttontext" target="EditFacility" text="${uiLabelMap.ProductCreateNewFacility}"/>
+                        </container>
+                        <include-form name="FindFacility" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>