Re: svn commit: r540162 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java

[Andrew Zeneski]

Jacques,




Andrew

On May 21, 2007, at 11:05 AM, [EMAIL PROTECTED] wrote:

The hasFilter() method you removed here is being used in the orderlist BSH file. Now, that this method is gone, the order list screen blows up. Can you look at this?

Author: jleroux
Date: Mon May 21 08:05:42 2007
New Revision: 540162

URL: http://svn.apache.org/viewvc?view=rev&rev=540162
Log:


Modified:

The orderFiltersStateId field does not exist in the entity OrderHeader, hence this lines are at least unuseful. I guess it was my mistake adding this lines when reviewing Leon's patch ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ OrderListState.java Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ OrderListState.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ src/org/ofbiz/order/order/OrderListState.java? view=diff&rev=540162&r1=540161&r2=540162 ====================================================================== ======== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ OrderListState.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ OrderListState.java Mon May 21 08:05:42 2007

@@ -190,7 +190,6 @@



     public boolean hasAllStatus() {

@@ -229,11 +228,6 @@

         }
         List filterConditions = new ArrayList();

-            String type = (String) iter.next();
-            if (!hasType(type)) continue;

-        }


@@ -241,9 +235,6 @@

             allConditions.add(statusConditionsList);
             allConditions.add(typeConditionsList);
-        }
-        if (filterConditions.size() > 0) {
-            allConditions.add(filterConditionsList);
         }

public boolean hasStatus(String param) { return ("Y".equals (orderStatusState.get(param))); } public boolean hasType(String param) { return ("Y".equals (orderTypeState.get(param))); } - public boolean hasFilter(String param) { return ("Y".equals (orderFilterState.get(param))); } for (Iterator iter = orderStatusState.values().iterator(); iter.hasNext(); ) { typeConditions.add( new EntityExpr("orderTypeId", EntityOperator.EQUALS, parameterToOrderTypeId.get(type)) ); - for (Iterator iter = orderFilterState.keySet().iterator(); iter.hasNext(); ) { - filterConditions.add( new EntityExpr ("orderFiltersStateId", EntityOperator.EQUALS, parameterToFilterId.get(type)) ); EntityCondition statusConditionsList = new EntityConditionList(statusConditions, EntityOperator.OR); EntityCondition typeConditionsList = new EntityConditionList(typeConditions, EntityOperator.OR); if ((typeConditions.size() > 0) && (statusConditions.size () > 0)) { EntityCondition queryConditionsList = new EntityConditionList(allConditions, EntityOperator.AND);

smime.p7s
Description: S/MIME cryptographic signature