From 5c66e5573577fefcd5964f62a3dccd997d0a7431 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 18 May 2015 13:21:49 +0000 Subject: [PATCH] RM-2160 (Update Classify Action config once users with security clearances exist) +review RM-57 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rm-ui-evaluators-context.xml | 1 - .../jscript/app/JSONConversionComponent.java | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml index 203925f02e..7d9365adde 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml @@ -17,7 +17,6 @@ - diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 27be66ac9e..e33a052f81 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -26,7 +26,6 @@ import java.util.Map; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService; import org.alfresco.module.org_alfresco_module_rm.capability.impl.ViewRecordsCapability; -import org.alfresco.module.org_alfresco_module_rm.classification.SecurityClearanceService; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanComponentKind; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; @@ -66,7 +65,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS private static final String IS_RM_SITE_CREATED = "isRmSiteCreated"; private static final String IS_RECORD_CONTRIBUTOR_GROUP_ENABLED = "isRecordContributorGroupEnabled"; private static final String RECORD_CONTRIBUTOR_GROUP_NAME = "recordContributorGroupName"; - private static final String HAS_CLEARANCE = "hasClearance"; /** true if record contributor group is enabled, false otherwise */ private boolean isRecordContributorsGroupEnabled = false; @@ -89,9 +87,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS /** site service */ private SiteService siteService; - /** Security clearance service */ - private SecurityClearanceService securityClearanceService; - /** Indicators */ private List indicators = new ArrayList(); @@ -163,14 +158,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS this.siteService = siteService; } - /** - * @param securityClearanceService the securityClearanceService to set - */ - public void setSecurityClearanceService(SecurityClearanceService securityClearanceService) - { - this.securityClearanceService = securityClearanceService; - } - /** * @param indicator registered indicator */ @@ -254,9 +241,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS // Get the node reference for convenience NodeRef nodeRef = nodeInfo.getNodeRef(); - // Get the clearance information for the node - rootJSONObject.put(HAS_CLEARANCE, securityClearanceService.hasClearance(nodeRef)); - if (AccessStatus.ALLOWED.equals(capabilityService.getCapabilityAccessState(nodeRef, ViewRecordsCapability.NAME))) { // Indicate whether the node is a RM object or not