From 60504a8c2be9142a3d7cfcac25170d93ebd9ad81 Mon Sep 17 00:00:00 2001
From: Arun Patidar <arunpatidar@apache.org>
Date: Sat, 20 Jun 2015 13:28:30 +0000
Subject: [PATCH] [OFBIZ-6237] Applied patch from the task. Fixed the issue of
 deleting existing GeoAssocs records while addind new GeoAssocs. Thanks
 Himanil Gupta for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686616 13f79535-47bb-0310-9956-ffa450edef68
---
 .../script/org/ofbiz/common/CommonServices.xml    | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/framework/common/script/org/ofbiz/common/CommonServices.xml b/framework/common/script/org/ofbiz/common/CommonServices.xml
index 97e231f2f84..21153bbcdb7 100644
--- a/framework/common/script/org/ofbiz/common/CommonServices.xml
+++ b/framework/common/script/org/ofbiz/common/CommonServices.xml
@@ -271,20 +271,9 @@ under the License.
     <simple-method method-name="linkGeos" short-description="Link Geos to another Geo">
         <entity-and entity-name="GeoAssoc" list="geoAssocs">
             <field-map field-name="geoId" from-field="parameters.geoId"/>
+            <field-map field-name="geoAssocTypeId" from-field="parameters.geoAssocTypeId"/>
         </entity-and>
-        <!-- Current list contains old values? -->
-        <iterate list="geoAssocs" entry="geoAssoc">
-            <if-compare-field field="parameters.geoIds" operator="contains" to-field="geoAssoc.geoIdTo">
-                <!-- Yes, nothing to do, it already exists and we keep it -->
-                <else><!-- Remove -->
-                    <entity-one entity-name="GeoAssoc" value-field="oldGeoAssoc">
-                        <field-map field-name="geoId" from-field="parameters.geoId"/>
-                        <field-map field-name="geoIdTo" from-field="geoAssoc.geoIdTo"/>
-                    </entity-one>
-                    <remove-value value-field="oldGeoAssoc"/>
-                </else>
-            </if-compare-field>
-        </iterate>
+        <set field="oldGeoIds" value="${groovy:org.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(geoAssocs, 'geoIdTo', true);}"/>
         <!-- Old list contains current values -->
         <iterate list="parameters.geoIds" entry="geoIdTo">
             <if-compare-field field="oldGeoIds" operator="contains" to-field="geoIdTo">