inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-975: Unable to change the name of a vital folder that contains a frozen record

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-19 05:56:32 +00:00
parent ce269f12b7
commit c677956ccb
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/config/alfresco/module/org_alfresco_module_rm/log4j.properties
View File

@@ -18,4 +18,4 @@ log4j.logger.org.alfresco.module.org_alfresco_module_rm.patch=info
#log4j.logger.org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl=debug #log4j.logger.org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl=debug
#log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=on #log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=on
log4j.logger.org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService=debug #log4j.logger.org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService=debug

10
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java
View File

@@ -28,6 +28,7 @@ import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstrac
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService; import org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -67,7 +68,7 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra
@Override @Override
protected void executeImpl(Action action, final NodeRef actionedUponNodeRef) protected void executeImpl(Action action, final NodeRef actionedUponNodeRef)
{ {
filePlanAuthenticationService.runAsRmAdmin(new RunAsWork<Void>() AuthenticationUtil.runAs(new RunAsWork<Void>()
{ {
@Override @Override
public Void doWork() throws Exception public Void doWork() throws Exception
@@ -75,7 +76,7 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra
propagateChangeToChildrenOf(actionedUponNodeRef); propagateChangeToChildrenOf(actionedUponNodeRef);
return null; return null;
} }
}); }, AuthenticationUtil.getAdminUserName());
} }
/** /**
@@ -102,10 +103,11 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra
{ {
NodeRef nextChild = nextAssoc.getChildRef(); NodeRef nextChild = nextAssoc.getChildRef();
if (filePlanService.isFilePlanComponent(nextChild) == true) if (filePlanService.isFilePlanComponent(nextChild) == true &&
freezeService.isFrozen(nextChild) == false)
{ {
// If the child is a record, then the VitalRecord aspect needs to be applied or updated // If the child is a record, then the VitalRecord aspect needs to be applied or updated
if (recordService.isRecord(nextChild)) if (recordService.isRecord(nextChild) == true)
{ {
if (parentVri) if (parentVri)
{ {

26
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java
View File

@@ -31,9 +31,9 @@ import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService; import org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService;
import org.alfresco.repo.node.NodeServicePolicies; import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
import org.alfresco.repo.policy.JavaBehaviour; import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent; import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -42,6 +42,7 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.repository.Period;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.ParameterCheck; import org.alfresco.util.ParameterCheck;
import org.alfresco.util.PropertyMap;
/** /**
* Vital record service interface implementation. * Vital record service interface implementation.
@@ -141,17 +142,24 @@ public class VitalRecordServiceImpl implements VitalRecordService,
@Override @Override
public void onUpdateProperties(final NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after) public void onUpdateProperties(final NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after)
{ {
if (nodeService.exists(nodeRef) == true && nodeService.hasAspect(nodeRef, ASPECT_FILE_PLAN_COMPONENT) == true) if (nodeService.exists(nodeRef) == true &&
nodeService.hasAspect(nodeRef, ASPECT_FILE_PLAN_COMPONENT) == true)
{ {
filePlanAuthenticationService.runAsRmAdmin(new RunAsWork<Void>() // check that vital record definition has been changed in the first place
Map<QName, Serializable> changedProps = PropertyMap.getChangedProperties(before, after);
if (changedProps.containsKey(PROP_VITAL_RECORD_INDICATOR) == true ||
changedProps.containsKey(PROP_REVIEW_PERIOD) == true)
{ {
@Override filePlanAuthenticationService.runAsRmAdmin(new RunAsWork<Void>()
public Void doWork() throws Exception
{ {
rmActionService.executeRecordsManagementAction(nodeRef, "broadcastVitalRecordDefinition"); @Override
return null; public Void doWork() throws Exception
}} {
); rmActionService.executeRecordsManagementAction(nodeRef, "broadcastVitalRecordDefinition");
return null;
}}
);
}
} }
} }