From 4ba8e3152a0ef191e48630284213402ed4cfd982 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 19 Jan 2015 16:28:32 +0000 Subject: [PATCH 1/4] Changed the version number for RM HEAD to 3.0-SNAPHOT git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@93676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-server/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4f2b578766..c2dd56cddc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.3-SNAPSHOT + 3.0-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1221af32e3..0875d9f9ef 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -3,7 +3,7 @@ org.alfresco alfresco-rm-parent - 2.3-SNAPSHOT + 3.0-SNAPSHOT 4.0.0 alfresco-rm-automation diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 5dc43e4252..ca2e88a85b 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.3-SNAPSHOT + 3.0-SNAPSHOT 4.0.0 alfresco-rm-server From 3cdb79337a7bcaed2e0bef7abede622a4e1a74b3 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Tue, 20 Jan 2015 12:30:44 +0000 Subject: [PATCH 2/4] Updated the README.txt git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@93721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- README.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.txt b/README.txt index 15d8f9c13e..976bf6e927 100644 --- a/README.txt +++ b/README.txt @@ -19,6 +19,8 @@ Using Eclipse - Import projects as Maven projects ("Import > Maven > Existing Maven Projects") - Browse to the code directory of your project and select "rm-server/pom.xml" and "rm-share/pom.xml". DO NOT select the parent "/pom.xml" - Open the Ant view and add the build files for both modules ("build.xml") + - If you are not working on a Windows machine you need to change the value of a property called "mvn.exec". + To do this create a file called "build.local.properties" under the code directory and change the value in that new file. - Run the "prepareEnv" target for rm-server which will prepare the development environment. This target must be run just once. - Now "fullBuild" target can be run which will create the amp file, apply it to the war file and copy the war file to webapps folder. From 878f5d468a7c746d5ae804f5fb04b8c662b0e672 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Tue, 20 Jan 2015 15:46:10 +0000 Subject: [PATCH 3/4] RM-1800 (Transfers are not displayed for non-rm-admin users) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@93745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../app/evaluator/TransferEvaluator.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluator.java index 06a89aa953..56cb735b6a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluator.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluator.java @@ -22,9 +22,13 @@ import java.util.List; import org.alfresco.module.org_alfresco_module_rm.jscript.app.BaseEvaluator; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; +import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.RegexQNamePattern; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Evaluates whether the node in question is transferring is either a transfer or accession. @@ -33,6 +37,9 @@ import org.alfresco.service.namespace.RegexQNamePattern; */ public class TransferEvaluator extends BaseEvaluator { + /** Logger */ + private static Log logger = LogFactory.getLog(TransferEvaluator.class); + /** indicates whether we are looking for accessions or transfers */ private boolean transferAccessionIndicator = false; @@ -55,8 +62,18 @@ public class TransferEvaluator extends BaseEvaluator NodeRef transfer = getTransferNodeRef(nodeRef); if (transfer != null) { - boolean actual = ((Boolean)nodeService.getProperty(transfer, RecordsManagementModel.PROP_TRANSFER_ACCESSION_INDICATOR)).booleanValue(); - result = (actual == transferAccessionIndicator); + try + { + boolean actual = ((Boolean)nodeService.getProperty(transfer, RecordsManagementModel.PROP_TRANSFER_ACCESSION_INDICATOR)).booleanValue(); + result = (actual == transferAccessionIndicator); + } + catch (AccessDeniedException ade) + { + logger.info("The user '" + + AuthenticationUtil.getFullyAuthenticatedUser() + + "' does not have permissions on the node '" + + transfer + "'."); + } } return result; From cb4632adeda3a272641b426979bbbac9554c5b0a Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Tue, 20 Jan 2015 21:59:11 +0000 Subject: [PATCH 4/4] RM-1825 (Can't move/delete in-place record when outbound rule to Hide Record is set) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@93764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../record/InplaceRecordServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java index e90693e924..16bd7effb9 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java @@ -18,6 +18,8 @@ */ package org.alfresco.module.org_alfresco_module_rm.record; +import static org.alfresco.model.ContentModel.ASPECT_PENDING_DELETE; + import java.util.List; import java.util.Set; @@ -96,7 +98,9 @@ public class InplaceRecordServiceImpl extends ServiceBaseImpl implements Inplace List parentAssocs = nodeService.getParentAssocs(nodeRef); for (ChildAssociationRef childAssociationRef : parentAssocs) { - if (!childAssociationRef.isPrimary() && childAssociationRef.getParentRef().equals(originatingLocation)) + if (!childAssociationRef.isPrimary() && + childAssociationRef.getParentRef().equals(originatingLocation) && + !nodeService.hasAspect(childAssociationRef.getChildRef(), ASPECT_PENDING_DELETE)) { nodeService.removeChildAssociation(childAssociationRef); break;