Author: jacopoc
Date: Mon Jul  2 04:13:04 2007
New Revision: 552466

URL: http://svn.apache.org/viewvc?view=rev&rev=552466
Log:
Applied (modified) by Wickersheimer Jeremy (OFBIZ-1049) to migrate the find 
facility group screen to widgets.

Removed:
    ofbiz/trunk/applications/product/webapp/facility/group/FindFacilityGroup.ftl
Modified:
    ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    
ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.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=552466&r1=552465&r2=552466
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml 
(original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml 
Mon Jul  2 04:13:04 2007
@@ -289,8 +289,8 @@
             <submit/>
         </field>
     </form>
-    <!-- Forms of FacilityGroups    -->
-    <form name="EditFacilityGroups" type="list" target="updateGroupToFacility" 
title="" list-name="facilityGroupMembers">
+    <!-- FacilityGroups -->
+    <form name="EditFacilityGroups" type="list" target="updateGroupToFacility" 
paginate-target="EditFacilityGroups" title="" list-name="facilityGroupMembers">
         <auto-fields-entity entity-name="FacilityGroupMember"/>
         <field name="facilityId"><hidden/></field>
         <field name="facilityGroupId">

Modified: 
ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml?view=diff&rev=552466&r1=552465&r2=552466
==============================================================================
--- 
ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml 
(original)
+++ 
ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupForms.xml 
Mon Jul  2 04:13:04 2007
@@ -21,6 +21,14 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
         
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";>
     <!-- Forms for FacilityGroups -->
+    <form name="FindFacilityGroup" type="list" title="" 
list-name="facilityGroups" paginate-target="FindFacilityGroup">
+        <auto-fields-entity entity-name="FacilityGroup" 
default-field-type="display"/>
+        <field name="facilityGroupId" widget-style="buttontext">
+            <hyperlink description="${facilityGroupId}" 
target="EditFacilityGroup?facilityGroupId=${facilityGroupId}"/>
+        </field>
+        <field name="facilityGroupTypeId"><display-entity 
entity-name="FacilityGroupType"/></field>
+        <field name="description"><display/></field>
+    </form>
     <form name="EditFacilityGroup" type="single" target="updateFacilityGroup" 
title="" default-map-name="facilityGroup">
         <alt-target use-when="facilityGroup==null" 
target="createFacilityGroup"/>
         <auto-fields-service service-name="updateFacilityGroup"/>

Modified: 
ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?view=diff&rev=552466&r1=552465&r2=552466
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml 
(original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml 
Mon Jul  2 04:13:04 2007
@@ -30,9 +30,13 @@
             <widgets>
                 <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template 
location="component://product/webapp/facility/group/FindFacilityGroup.ftl"/></html>
-                        </platform-specific>
+                        <container>
+                            <label 
style="head1">${uiLabelMap.ProductFacilityGroupList}</label>
+                        </container>
+                        <container>
+                            <link target="EditFacilityGroup" 
text="${uiLabelMap.ProductNewGroup}" style="buttontext"/>
+                        </container>
+                        <include-form name="FindFacilityGroup" 
location="component://product/webapp/facility/group/FacilityGroupForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>


Reply via email to