Author: jleroux
Date: Fri Apr 4 00:12:38 2008
New Revision: 644629
URL:
http://svn.apache.org/viewvc?rev=644629&view=revLog:
A patch from Anne Jessel "Two Australian "states" missing from drop-down list" (
https://issues.apache.org/jira/browse/OFBIZ-1737) - OFBIZ-1737
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=644629&r1=644628&r2=644629&view=diff==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java Fri Apr 4 00:12:38 2008
@@ -69,7 +69,8 @@
public static List getStateList(GenericDelegator delegator) {
List geoList = FastList.newInstance();
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);