From d2c2f142701da8f176bb81132d1cb17bd9623818 Mon Sep 17 00:00:00 2001 From: rlucanu Date: Fri, 13 Sep 2019 13:44:01 +0300 Subject: [PATCH 1/3] RM-6943 code review changes --- .../jscript/app/JSONConversionComponent.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index f98d70e154..0626c8ed52 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -87,7 +87,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS private static final String IS_RECORD_CONTRIBUTOR_GROUP_ENABLED = "isRecordContributorGroupEnabled"; private static final String RECORD_CONTRIBUTOR_GROUP_NAME = "recordContributorGroupName"; private static final String IS_VISIBLE_FOR_CURRENT_USER = "isVisibleForCurrentUser"; - private static final String IS_ADD_TO_HOLD_VISIBLE = "isAddToHoldVisible"; /** true if record contributor group is enabled, false otherwise */ private boolean isRecordContributorsGroupEnabled = false; @@ -329,11 +328,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS rootJSONObject.put(IS_VISIBLE_FOR_CURRENT_USER, hasFilingPermission); } } - - if (AccessStatus.ALLOWED.equals(permissionService.hasPermission(nodeRef, PermissionService.WRITE))) - { - rootJSONObject.put(IS_ADD_TO_HOLD_VISIBLE, true); - } } } From e3e3273ab0e1ce32375ff80a2c3eb89c8a19f1b2 Mon Sep 17 00:00:00 2001 From: rlucanu Date: Fri, 13 Sep 2019 16:26:27 +0300 Subject: [PATCH 2/3] RM-6943 other code review comments --- .../jscript/app/JSONConversionComponent.java | 1 - 1 file changed, 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 0626c8ed52..1030d9b75c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -60,7 +60,6 @@ import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.AccessStatus; -import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.namespace.NamespaceService; From 066503b5157004fb6432a8052a4a7889838c21bd Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Mon, 16 Sep 2019 09:08:14 +0100 Subject: [PATCH 3/3] RM-6945: Display available actions on held active content inside a hold - added actions for isFreezeActiveContent --- .../rm-service-context.xml | 2 +- .../rm-ui-evaluators-context.xml | 1 + .../jscript/app/JSONConversionComponent.java | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 7b7a037aa7..00e1ccddaf 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -908,7 +908,7 @@ + diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 1030d9b75c..1c7c3db3bd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -45,6 +45,7 @@ import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService import org.alfresco.module.org_alfresco_module_rm.event.EventCompletionDetails; 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.freeze.FreezeService; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.record.RecordService; import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService; @@ -86,6 +87,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS private static final String IS_RECORD_CONTRIBUTOR_GROUP_ENABLED = "isRecordContributorGroupEnabled"; private static final String RECORD_CONTRIBUTOR_GROUP_NAME = "recordContributorGroupName"; private static final String IS_VISIBLE_FOR_CURRENT_USER = "isVisibleForCurrentUser"; + private static final String FROZEN_ACTIVE_CONTENT = "frozencontent"; /** true if record contributor group is enabled, false otherwise */ private boolean isRecordContributorsGroupEnabled = false; @@ -111,6 +113,9 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS /** site service */ private SiteService siteService; + /** freeze service */ + private FreezeService freezeService; + /** * Disposition service */ @@ -263,6 +268,12 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS this.dispositionService = dispositionService; } + /** + * + * @param freezeService + */ + public void setFreezeService(FreezeService freezeService) { this.freezeService = freezeService; } + /** * The initialise method */ @@ -292,6 +303,8 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS // Set the base root values super.setRootValues(nodeInfo, rootJSONObject, useShortQNames); + rootJSONObject.put("uiType", getUIType(nodeInfo.getNodeRef())); + // check the existence of the RM site checkRmSiteExistence(rootJSONObject); @@ -655,7 +668,10 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS } } } - + else if (freezeService.isFrozen(nodeRef)) + { + result = FROZEN_ACTIVE_CONTENT; + } return result; }