From a606a343b368ec1845f301ad489fffd4cd29cff1 Mon Sep 17 00:00:00 2001 From: rlucanu Date: Tue, 9 Jul 2019 12:12:28 +0300 Subject: [PATCH] Revert "Record only merge of version change." This reverts commit 6e197f2a2d8ba8724005ef0d903f0ad1efaeccdd, reversing changes made to 211244279a2763bccf88e3d250f503dddf19df76. --- pom.xml | 4 +-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- .../capability/RMAfterInvocationProvider.java | 2 -- .../disposition/DispositionScheduleImpl.java | 28 +++++-------------- .../disposition/DispositionServiceImpl.java | 5 +--- 7 files changed, 13 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 2bb16c3e43..4797d209c1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.5-SNAPSHOT + 2.5.3.3-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - HEAD + V2.5.3 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 21a954745a..c61d666c8e 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.5-SNAPSHOT + 2.5.3.3-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 53f27e0007..73c9631e3e 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.5-SNAPSHOT + 2.5.3.3-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 776105b476..7e79f8c07f 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.5-SNAPSHOT + 2.5.3.3-SNAPSHOT diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index 85a64b7c01..8ed963c752 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -485,7 +485,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon returnedObject.getResultSetMetaData().getLimitedBy(), PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData().getSearchParameters())); - filteringResultSet.setNumberFound(returnedObject.getNumberFound()); return filteringResultSet; } else @@ -499,7 +498,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon returnedObject.getResultSetMetaData().getLimitedBy(), PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData().getSearchParameters())); - filteringResultSet.setNumberFound(returnedObject.getNumberFound()); return filteringResultSet; } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java index eec7f3db4e..5ab334b6a9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java @@ -35,7 +35,6 @@ import java.util.Map; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; -import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; @@ -52,10 +51,7 @@ public class DispositionScheduleImpl implements DispositionSchedule, private NodeService nodeService; private RecordsManagementServiceRegistry services; private NodeRef dispositionDefinitionNodeRef; - /** authentication helper */ - private AuthenticationUtil authenticationUtil; - - + private List actions; private Map actionsById; @@ -65,11 +61,6 @@ public class DispositionScheduleImpl implements DispositionSchedule, /** Map of disposition definitions by disposition action name */ private Map actionsByDispositionActionName; - - public void setAuthenticationUtil(AuthenticationUtil authenticationUtil) - { - this.authenticationUtil = authenticationUtil; - } public DispositionScheduleImpl(RecordsManagementServiceRegistry services, NodeService nodeService, NodeRef nodeRef) { @@ -109,18 +100,13 @@ public class DispositionScheduleImpl implements DispositionSchedule, */ public boolean isRecordLevelDisposition() { - return authenticationUtil.runAsSystem(new AuthenticationUtil.RunAsWork() + boolean result = false; + Boolean value = (Boolean)this.nodeService.getProperty(this.dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION); + if (value != null) { - public Boolean doWork() throws Exception - { - Boolean value = (Boolean)nodeService.getProperty(dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION); - if (value != null) - { - return value.booleanValue(); - } - return null; - } - }); + result = value.booleanValue(); + } + return result; } /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index d3cd3cb49d..32f68c1bb5 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -348,9 +348,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl return ds; } - - - /** * This method returns a NodeRef * Gets the disposition instructions @@ -383,7 +380,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl NodeRef result = getAssociatedDispositionScheduleImpl(parent); if (result == null) { - return null; + return getOriginDispositionSchedule(parent); } return new DispositionScheduleImpl(serviceRegistry, nodeService, result); }