You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/04/04 09:14:42 UTC
svn commit: r644631 -
/ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonWorkers.java
Author: jleroux
Date: Fri Apr 4 00:14:41 2008
New Revision: 644631
URL: http://svn.apache.org/viewvc?rev=644631&view=rev
Log:
Applied fix from trunk for revision: 644629
Modified:
ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonWorkers.java
Modified: ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonWorkers.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=644631&r1=644630&r2=644631&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonWorkers.java (original)
+++ ofbiz/branches/release4.0/framework/common/src/org/ofbiz/common/CommonWorkers.java Fri Apr 4 00:14:41 2008
@@ -70,7 +70,8 @@
public static List getStateList(GenericDelegator delegator) {
List geoList = new ArrayList();
EntityCondition condition = new EntityConditionList(UtilMisc.toList(
- new EntityExpr("geoTypeId", EntityOperator.EQUALS, "STATE"), new EntityExpr("geoTypeId", EntityOperator.EQUALS, "PROVINCE")), EntityOperator.OR);
+ new EntityExpr("geoTypeId", EntityOperator.EQUALS, "STATE"), new EntityExpr("geoTypeId", EntityOperator.EQUALS, "PROVINCE"),
+ new EntityExpr("geoTypeId", EntityOperator.EQUALS, "TERRITORY")), EntityOperator.OR);
List sortList = UtilMisc.toList("geoName");
try {
geoList = delegator.findByConditionCache("Geo", condition, null, sortList);