Author: mrisaliti
Date: Thu Dec 17 21:35:30 2009
New Revision: 891925
URL:
http://svn.apache.org/viewvc?rev=891925&view=revLog:
When gets the associated state list to the regions show also the county (OFBIZ-3359)
Modified:
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=891925&r1=891924&r2=891925&view=diff==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java Thu Dec 17 21:35:30 2009
@@ -18,9 +18,7 @@
*******************************************************************************/
package org.ofbiz.common;
-import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
import javolution.util.FastList;
@@ -115,7 +113,8 @@
EntityCondition.makeCondition("geoAssocTypeId", "REGIONS"),
EntityCondition.makeCondition(EntityOperator.OR,
EntityCondition.makeCondition("geoTypeId", "STATE"),
- EntityCondition.makeCondition("geoTypeId", "PROVINCE")));
+ EntityCondition.makeCondition("geoTypeId", "PROVINCE"),
+ EntityCondition.makeCondition("geoTypeId", "COUNTY")));
List<String> sortList = UtilMisc.toList("geoId");
List<GenericValue> geoList = FastList.newInstance();