From 5cb2fb1f51fc02d8fd7e5c5edc609c69dcaec23e Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 12 Oct 2012 09:51:24 +0000 Subject: [PATCH] Merged modules/recordsmanagement/BRANCHES/V2.0-BUG-FIX to modules/recordsmanagement/BRANCHES/V2.0 42532: RM-510 (CLONE - RM Email Mapping tool behaves strangely) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@42564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../script/EmailMapPost.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java index a712cc2e64..369f069218 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java @@ -53,6 +53,16 @@ public class EmailMapPost extends DeclarativeWebScript JSONObject json = null; json = new JSONObject(new JSONTokener(req.getContent().getContent())); + if(json.has("delete")) + { + JSONArray toDelete = json.getJSONArray("delete"); + for(int i = 0 ; i < toDelete.length(); i++) + { + JSONObject val = toDelete.getJSONObject(i); + customEmailMappingService.deleteCustomMapping(val.getString("from"), val.getString("to")); + } + } + if(json.has("add")) { JSONArray toAdd = json.getJSONArray("add"); @@ -64,17 +74,6 @@ public class EmailMapPost extends DeclarativeWebScript } } - if(json.has("delete")) - { - JSONArray toDelete = json.getJSONArray("delete"); - for(int i = 0 ; i < toDelete.length(); i++) - { - JSONObject val = toDelete.getJSONObject(i); - customEmailMappingService.deleteCustomMapping(val.getString("from"), val.getString("to")); - } - } - - // Set the return value. Set emailMap = customEmailMappingService.getCustomMappings(); // create model object with the lists model