svn commit: r1689263 - /ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/CommonWorkers.java

[shijh]

Author: shijh
Date: Sun Jul  5 16:45:05 2015
New Revision: 1689263

URL: http://svn.apache.org/r1689263
Log:
OFBIZ-6542 as Gan Hong-Wai suggested, added EntityCondition.makeCondition("geoTypeId", "TERRITORY") in CommonWorkers.java of Release 13.07.

Tested the change on page /ecommerce/control/editcontactmechnosave with Australia as the country selected, the Australian Capital Territory (AU-ACT) and Northern Territory (AU-NT) are in state list now.

Modified:
    ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/CommonWorkers.java

Modified: ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/CommonWorkers.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=1689263&r1=1689262&r2=1689263&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/CommonWorkers.java (original)
+++ ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/CommonWorkers.java Sun Jul  5 16:45:05 2015
@@ -139,7 +139,7 @@ public class CommonWorkers {
                     EntityCondition.makeCondition("geoIdFrom", country),
                     EntityCondition.makeCondition("geoAssocTypeId", "REGIONS"),
                     EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"), EntityCondition.makeCondition("geoTypeId", "PROVINCE"), EntityCondition.makeCondition("geoTypeId", "MUNICIPALITY"),
-                            EntityCondition.makeCondition("geoTypeId", "COUNTY")));
+                     EntityCondition.makeCondition("geoTypeId", "TERRITORY"), EntityCondition.makeCondition("geoTypeId", "COUNTY")));
             geoList.addAll(delegator.findList("GeoAssocAndGeoToWithState", stateProvinceFindCond, null, sortList, null, true));
         } catch (GenericEntityException e) {
             Debug.logError(e, "Cannot lookup Geo", module);