svn commit: r428034 - in /incubator/ofbiz/trunk/applications/product: webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh webapp/facility/facility/FacilityForms.xml widget/facility/FacilityScreens.xml

[jacopoc]

Author: jacopoc
Date: Wed Aug  2 08:39:41 2006
New Revision: 428034

URL: http://svn.apache.org/viewvc?rev=428034&view=rev
Log:
Found a better solution to fix a small bug in category drop down (it was messed up by a parameter set in the screen action).

Modified:
    incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh
    incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh?rev=428034&r1=428033&r2=428034&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh Wed Aug  2 08:39:41 2006
@@ -59,11 +59,11 @@
         prodView.addAlias("PROD", "productTypeId");
         conditionMap.put("productTypeId", productTypeId);
     }
-    if (productCategoryId != null && productCategoryId.length() > 0) {
+    if (searchInProductCategoryId != null && searchInProductCategoryId.length() > 0) {
         prodView.addMemberEntity("PRCA", "ProductCategoryMember");
         prodView.addViewLink("PRFA", "PRCA", Boolean.FALSE, ModelKeyMap.makeKeyMapList("productId"));
         prodView.addAlias("PRCA", "productCategoryId");
-        conditionMap.put("productCategoryId", productCategoryId);
+        conditionMap.put("productCategoryId", searchInProductCategoryId);
     }
 
     if (productSupplierId != null && productSupplierId.length() > 0) {

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=428034&r1=428033&r2=428034&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Wed Aug  2 08:39:41 2006
@@ -32,7 +32,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="productCategoryId" title="${uiLabelMap.ProductCategory}" widget-style="selectBox">
+        <field name="searchInProductCategoryId" title="${uiLabelMap.ProductCategory}" widget-style="selectBox">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ProductCategory" key-field-name="productCategoryId" description="${description} [${productCategoryId}]">
                     <entity-constraint name="showInSelect"  value="N" operator="not-equals"/>

Modified: incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=428034&r1=428033&r2=428034&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Aug  2 08:39:41 2006
@@ -206,6 +206,7 @@
 
                 <set field="facilityId" from-field="parameters.facilityId"/>
                 <set field="productTypeId" from-field="parameters.productTypeId"/>
+                <set field="searchInProductCategoryId" from-field="parameters.searchInProductCategoryId"/>
                 <set field="productSupplierId" from-field="parameters.productSupplierId"/>
                 <set field="offsetQty" from-field="parameters.offsetQty"/>