svn commit: r658478 - in /ofbiz/trunk/applications/product: webapp/facility/WEB-INF/controller.xml widget/facility/FacilityScreens.xml

[adrianc]

Author: adrianc
Date: Tue May 20 15:59:07 2008
New Revision: 658478

URL: http://svn.apache.org/viewvc?rev=658478&view=rev
Log:
Fixup for the Find Facility screen commit. I tried to update the Search Option section using Ajax, but I couldn't get it to work. So, I'm removing that code.

Modified:
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=658478&r1=658477&r2=658478&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Tue May 20 15:59:07 2008
@@ -63,10 +63,6 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="FindFacility"/>
     </request-map>
-    <request-map uri="FacilitySearchOptions">
-        <security https="true" auth="false"/>
-        <response name="success" type="view" value="FacilitySearchOptions"/>
-    </request-map>
     <request-map uri="FacilitySearchResults">
         <security https="true" auth="false"/>
         <response name="success" type="view" value="FacilitySearchResults"/>
@@ -1107,7 +1103,6 @@
     <view-map name="main" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacility"/>
 
     <view-map name="FindFacility" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacility"/>
-    <view-map name="FacilitySearchOptions" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FacilitySearchOptions"/>
     <view-map name="FacilitySearchResults" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FacilitySearchResults"/>
     <view-map name="EditFacility" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacility"/>
     <view-map name="FindFacilityTransfers" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacilityTransfers"/>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=658478&r1=658477&r2=658478&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Tue May 20 15:59:07 2008
@@ -46,7 +46,7 @@
                                         </section>
                                     </decorator-section>
                                     <decorator-section name="search-options">
-                                        <include-screen name="FacilitySearchOptions"/>
+                                        <include-form name="FindFacilityOptions" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
                                         <include-screen name="FacilitySearchResults"/>
@@ -62,20 +62,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="FacilitySearchOptions">
-        <section>
-            <condition>
-                <if-service-permission service-name="facilityGenericPermission" main-action="VIEW"/>
-            </condition>
-            <actions>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <include-form name="FindFacilityOptions" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
-            </widgets>
-        </section>
-    </screen>
     <screen name="FacilitySearchResults">
         <section>
             <condition>