[OFBiz] SVN: r4762 - in trunk/applications/order: webapp/ordermgr/WEB-INF/actions/entry/catalog widget/ordermgr

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-04-05 15:54:13 -0500 (Tue, 05 Apr 2005)
New Revision: 4762

Modified:
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/advancedsearchoptions.bsh
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh
   trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
Log:
Small changes related to ordermgr/ecommerce refactorings; remove supplier query from script, now in screen def; related to Jira #OFBIZ-185

Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/advancedsearchoptions.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/advancedsearchoptions.bsh	2005-04-05 20:43:07 UTC (rev 4761)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/advancedsearchoptions.bsh	2005-04-05 20:54:13 UTC (rev 4762)
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *  Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a 
  *  copy of this software and associated documentation files (the "Software"), 
@@ -54,9 +54,6 @@
 searchConstraintStrings = ProductSearchSession.searchGetConstraintStrings(false, session, delegator);
 searchSortOrderString = ProductSearchSession.searchGetSortOrderString(false, session);
 
-//get suppliers in system
-supplerPartyRoleAndPartyDetails = delegator.findByAnd("PartyRoleAndPartyDetail", UtilMisc.toMap("roleTypeId", "SUPPLIER"), UtilMisc.toList("groupName", "firstName"));
-
 context.put("searchCategoryId", searchCategoryId);
 context.put("searchCategory", searchCategory);
 context.put("productFeaturesByTypeMap", productFeaturesByTypeMap);
@@ -64,4 +61,3 @@
 context.put("searchOperator", searchOperator);
 context.put("searchConstraintStrings", searchConstraintStrings);
 context.put("searchSortOrderString", searchSortOrderString);
-context.put("supplerPartyRoleAndPartyDetails", supplerPartyRoleAndPartyDetails);

Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh	2005-04-05 20:43:07 UTC (rev 4761)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh	2005-04-05 20:54:13 UTC (rev 4762)
@@ -88,9 +88,7 @@
     if (categoryId == null) {
         categoryId = request.getAttribute("productCategoryId");
     }
-    if (categoryId != null) {
-        context.put("categoryId", categoryId);
-    }
+    context.put("categoryId", categoryId);
 
     // get the product price
     priceMap = dispatcher.runSync("calculateProductPrice", 

Modified: trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml	2005-04-05 20:43:07 UTC (rev 4761)
+++ trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml	2005-04-05 20:54:13 UTC (rev 4762)
@@ -207,6 +207,13 @@
                 <set field="title-property" value="PageTitleAdvancedSearch"/>
                 <set field="headerItem" value="Advanced Search"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/advancedsearchoptions.bsh"/>
+                
+                <entity-condition entity-name="PartyRoleAndPartyDetail" list-name="supplerPartyRoleAndPartyDetails">
+                    <condition-expr field-name="roleTypeId" value="SUPPLIER"/>
+                    <order-by field-name="groupName"/>
+                    <order-by field-name="lastName"/>
+                    <order-by field-name="firstName"/>
+                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
@@ -243,6 +250,4 @@
             </widgets>
         </section>
     </screen>
-
-
 </screens>