mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
RM-1559: User with Create Hold capability can't create hold
RM-1561: Edit/Delete Hold actions are not displayed for user with proper capabilities * editHold and deleteHold specific capabilities added and UI actions wired up accordingly * capability patch addeded * freeze, unfreeze and related capabilities deprecated (but still avaialble if required) * some of the old freeze UI actions removed git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@74506 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -4,55 +4,7 @@
|
||||
<beans>
|
||||
|
||||
<!-- Public Capabilities -->
|
||||
|
||||
<bean id="rmExtendRetentionPeriodOrFreezeCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="ExtendRetentionPeriodOrFreeze"/>
|
||||
<property name="permission" value="ExtendRetentionPeriodOrFreeze"/>
|
||||
<property name="kinds">
|
||||
<list>
|
||||
<value>RECORD_FOLDER</value>
|
||||
<value>RECORD</value>
|
||||
</list>
|
||||
</property>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
<entry key="capabilityCondition.frozen" value="false"/>
|
||||
</map>
|
||||
</property>
|
||||
<property name="group"><ref bean="holdControlsGroup"/></property>
|
||||
<property name="index" value="10" />
|
||||
</bean>
|
||||
|
||||
<bean id="rmUnfreezeCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="Unfreeze"/>
|
||||
<property name="permission" value="Unfreeze"/>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
<entry key="capabilityCondition.frozenOrHold" value="true"/>
|
||||
</map>
|
||||
</property>
|
||||
<property name="group"><ref bean="holdControlsGroup"/></property>
|
||||
<property name="index" value="20" />
|
||||
</bean>
|
||||
|
||||
<bean id="rmViewUpdateReasonsForFreezeCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="ViewUpdateReasonsForFreeze"/>
|
||||
<property name="permission" value="ViewUpdateReasonsForFreeze"/>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
<entry key="capabilityCondition.frozenOrHold" value="true"/>
|
||||
</map>
|
||||
</property>
|
||||
<property name="group"><ref bean="holdControlsGroup"/></property>
|
||||
<property name="index" value="30" />
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="rmCreateHoldCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="CreateHold"/>
|
||||
@@ -70,6 +22,42 @@
|
||||
<property name="group"><ref bean="holdControlsGroup"/></property>
|
||||
<property name="index" value="40" />
|
||||
</bean>
|
||||
|
||||
<bean id="rmEditHoldCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="EditHold"/>
|
||||
<property name="permission" value="EditHold"/>
|
||||
<property name="kinds">
|
||||
<list>
|
||||
<value>HOLD</value>
|
||||
</list>
|
||||
</property>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
</map>
|
||||
</property>
|
||||
<property name="group"><ref bean="holdControlsGroup"/></property>
|
||||
<property name="index" value="46" />
|
||||
</bean>
|
||||
|
||||
<bean id="rmDeleteHoldCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="DeleteHold"/>
|
||||
<property name="permission" value="DeleteHold"/>
|
||||
<property name="kinds">
|
||||
<list>
|
||||
<value>HOLD</value>
|
||||
</list>
|
||||
</property>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
</map>
|
||||
</property>
|
||||
<property name="group"><ref bean="holdControlsGroup"/></property>
|
||||
<property name="index" value="48" />
|
||||
</bean>
|
||||
|
||||
<bean id="rmAddToHoldCapability"
|
||||
parent="declarativeCapability">
|
||||
@@ -132,4 +120,51 @@
|
||||
<property name="group"><ref bean="holdControlsGroup"/></property> <!-- Part of the hold group of capabilities -->
|
||||
<property name="index" value="80" />
|
||||
</bean>
|
||||
|
||||
<!-- Deprecated capabilities (as of 2.2) -->
|
||||
|
||||
<bean id="rmExtendRetentionPeriodOrFreezeCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="ExtendRetentionPeriodOrFreeze"/>
|
||||
<property name="permission" value="ExtendRetentionPeriodOrFreeze"/>
|
||||
<property name="private" value="true"/>
|
||||
<property name="kinds">
|
||||
<list>
|
||||
<value>RECORD_FOLDER</value>
|
||||
<value>RECORD</value>
|
||||
</list>
|
||||
</property>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
<entry key="capabilityCondition.frozen" value="false"/>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="rmUnfreezeCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="Unfreeze"/>
|
||||
<property name="permission" value="Unfreeze"/>
|
||||
<property name="private" value="true"/>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
<entry key="capabilityCondition.frozenOrHold" value="true"/>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="rmViewUpdateReasonsForFreezeCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="ViewUpdateReasonsForFreeze"/>
|
||||
<property name="permission" value="ViewUpdateReasonsForFreeze"/>
|
||||
<property name="private" value="true"/>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
<entry key="capabilityCondition.frozenOrHold" value="true"/>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
</beans>
|
@@ -23,7 +23,7 @@
|
||||
<ref bean="rmCreateModifyDestroyFileplanMetadataCapability"/>
|
||||
<ref bean="rmDeleteRecordFolderCapability"/>
|
||||
<ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
|
||||
<ref bean="rmDeleteHoldContainerCapability"/>
|
||||
<ref bean="rmDeleteHoldCapability"/>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
@@ -42,7 +42,7 @@
|
||||
<ref bean="rmCreateModifyRecordsInCuttoffFoldersCapability"/>
|
||||
<ref bean="rmEditRecordMetadataCapability"/>
|
||||
<ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
|
||||
<ref bean="rmModifyHoldCapability"/>
|
||||
<ref bean="rmEditHoldCapability"/>
|
||||
<ref bean="rmCreateRecordsCapability"/>
|
||||
</list>
|
||||
</property>
|
||||
@@ -61,7 +61,7 @@
|
||||
<ref bean="rmCreateModifyRecordsInCuttoffFoldersCapability"/>
|
||||
<ref bean="rmEditRecordMetadataCapability"/>
|
||||
<ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
|
||||
<ref bean="rmModifyHoldCapability"/>
|
||||
<ref bean="rmEditHoldCapability"/>
|
||||
<ref bean="rmCreateRecordsCapability"/>
|
||||
</list>
|
||||
</property>
|
||||
|
@@ -230,42 +230,4 @@
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="rmDeleteHoldContainerCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="DeleteHoldContainer"/>
|
||||
<property name="private" value="true"/>
|
||||
<property name="permission" value="CreateModifyDestroyFolders"/>
|
||||
<property name="kinds">
|
||||
<list>
|
||||
<value>HOLD</value>
|
||||
</list>
|
||||
</property>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
<entry key="capabilityCondition.cutoff" value="false"/>
|
||||
<entry key="capabilityCondition.closed" value="false"/>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="rmModifyHoldCapability"
|
||||
parent="declarativeCapability">
|
||||
<property name="name" value="ModifyHold"/>
|
||||
<property name="private" value="true"/>
|
||||
<property name="permission" value="CreateModifyDestroyFolders"/>
|
||||
<property name="kinds">
|
||||
<list>
|
||||
<value>HOLD</value>
|
||||
</list>
|
||||
</property>
|
||||
<property name="conditions">
|
||||
<map>
|
||||
<entry key="capabilityCondition.filling" value="true"/>
|
||||
<entry key="capabilityCondition.cutoff" value="false"/>
|
||||
<entry key="capabilityCondition.closed" value="false"/>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
</beans>
|
@@ -66,6 +66,8 @@ capability.CreateHold.title=Create Hold
|
||||
capability.AddToHold.title=Add to Hold
|
||||
capability.RemoveFromHold.title=Remove from Hold
|
||||
capability.FileHoldReport.title=File Hold Report
|
||||
capability.DeleteHold.title=Delete Hold
|
||||
capability.EditHold.title=Edit Hold
|
||||
|
||||
# Audit
|
||||
capability.group.audit.title=Audit
|
||||
|
@@ -93,6 +93,8 @@
|
||||
<includePermissionGroup type="rma:filePlanComponent" permissionGroup="AddToHold"/>
|
||||
<includePermissionGroup type="rma:filePlanComponent" permissionGroup="RemoveFromHold"/>
|
||||
<includePermissionGroup type="rma:filePlanComponent" permissionGroup="FileHoldReport"/>
|
||||
<includePermissionGroup type="rma:filePlanComponent" permissionGroup="DeleteHold"/>
|
||||
<includePermissionGroup type="rma:filePlanComponent" permissionGroup="EditHold"/>
|
||||
</permissionGroup>
|
||||
|
||||
<permissionGroup name="Filing" allowFullControl="false" expose="true">
|
||||
@@ -179,6 +181,8 @@
|
||||
<permissionGroup name="AddToHold" expose="false" allowFullControl="false"/>
|
||||
<permissionGroup name="RemoveFromHold" expose="false" allowFullControl="false"/>
|
||||
<permissionGroup name="FileHoldReport" expose="false" allowFullControl="false"/>
|
||||
<permissionGroup name="DeleteHold" expose="false" allowFullControl="false"/>
|
||||
<permissionGroup name="EditHold" expose="false" allowFullControl="false"/>
|
||||
|
||||
<!-- End -->
|
||||
|
||||
@@ -474,6 +478,14 @@
|
||||
<grantedToGroup permissionGroup="FileHoldReport"/>
|
||||
</permission>
|
||||
|
||||
<permission name="_DeleteHold" expose="false">
|
||||
<grantedToGroup permissionGroup="DeleteHold"/>
|
||||
</permission>
|
||||
|
||||
<permission name="_EditHold" expose="false">
|
||||
<grantedToGroup permissionGroup="EditHold"/>
|
||||
</permission>
|
||||
|
||||
</permissionSet>
|
||||
|
||||
</permissions>
|
@@ -51,8 +51,8 @@
|
||||
<property name="name" value="rma:frozen" />
|
||||
<property name="capabilities">
|
||||
<set>
|
||||
<ref bean="rmExtendRetentionPeriodOrFreezeCapability" />
|
||||
<ref bean="rmUnfreezeCapability" />
|
||||
<ref bean="rmAddToHoldCapability" />
|
||||
<ref bean="rmRemoveFromHoldCapability" />
|
||||
</set>
|
||||
</property>
|
||||
</bean>
|
||||
@@ -132,10 +132,9 @@
|
||||
<property name="name" value="rma:holdReason"/>
|
||||
<property name="capabilities">
|
||||
<set>
|
||||
<ref bean="rmViewUpdateReasonsForFreezeCapability" />
|
||||
<ref bean="rmExtendRetentionPeriodOrFreezeCapability" />
|
||||
<ref bean="rmUnfreezeCapability" />
|
||||
<ref bean="rmModifyHoldCapability" />
|
||||
<ref bean="rmCreateHoldCapability" />
|
||||
<ref bean="rmDeleteHoldCapability" />
|
||||
<ref bean="rmEditHoldCapability" />
|
||||
</set>
|
||||
</property>
|
||||
</bean>
|
||||
@@ -144,9 +143,8 @@
|
||||
<property name="name" value="rma:frozenAt"/>
|
||||
<property name="capabilities">
|
||||
<set>
|
||||
<ref bean="rmViewUpdateReasonsForFreezeCapability" />
|
||||
<ref bean="rmExtendRetentionPeriodOrFreezeCapability" />
|
||||
<ref bean="rmUnfreezeCapability" />
|
||||
<ref bean="rmAddToHoldCapability" />
|
||||
<ref bean="rmRemoveFromHoldCapability" />
|
||||
</set>
|
||||
</property>
|
||||
</bean>
|
||||
@@ -155,9 +153,8 @@
|
||||
<property name="name" value="rma:frozenBy"/>
|
||||
<property name="capabilities">
|
||||
<set>
|
||||
<ref bean="rmViewUpdateReasonsForFreezeCapability" />
|
||||
<ref bean="rmExtendRetentionPeriodOrFreezeCapability" />
|
||||
<ref bean="rmUnfreezeCapability" />
|
||||
<ref bean="rmAddToHoldCapability" />
|
||||
<ref bean="rmRemoveFromHoldCapability" />
|
||||
</set>
|
||||
</property>
|
||||
</bean>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<property name="description" value="RM patch executer"/>
|
||||
<property name="sinceVersion" value="2.2"/>
|
||||
<property name="executeOnceOnly" value="false"/>
|
||||
<property name="moduleSchema" value="1008"/>
|
||||
<property name="moduleSchema" value="1009"/>
|
||||
<property name="attributeService" ref="AttributeService" />
|
||||
<property name="dependsOn">
|
||||
<list>
|
||||
|
@@ -92,4 +92,15 @@
|
||||
<property name="authorityService" ref="AuthorityService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="rm.holdCapabilityPatch"
|
||||
parent="rm.parentModulePatch"
|
||||
class="org.alfresco.module.org_alfresco_module_rm.patch.v22.RMv22HoldCapabilityPatch">
|
||||
<property name="description" value="Add hold capabilities."/>
|
||||
<property name="fixesToSchema" value="1008"/>
|
||||
<property name="targetSchema" value="1009"/>
|
||||
<property name="filePlanService" ref="FilePlanService"/>
|
||||
<property name="filePlanRoleService" ref="FilePlanRoleService"/>
|
||||
<property name="capabilityService" ref="CapabilityService"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
@@ -1105,7 +1105,7 @@
|
||||
<bean id="deleteHold_security" parent="actionSecurity">
|
||||
<property name="objectDefinitionSource">
|
||||
<value>
|
||||
org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.execute=RM_CAP.0.rma:filePlanComponent.DeleteHoldContainer
|
||||
org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.execute=RM_CAP.0.rma:filePlanComponent.DeleteHold
|
||||
org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.*=RM_ALLOW
|
||||
org.alfresco.repo.action.executer.ActionExecuter.*=RM_ALLOW
|
||||
</value>
|
||||
|
@@ -548,30 +548,6 @@
|
||||
<property name="capability" value ="ManuallyChangeDispositionDates"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jsonConversionComponent.freezeAction"
|
||||
parent="jsonConversionComponent.baseAction">
|
||||
<property name="name" value="freeze"/>
|
||||
<property name="kinds">
|
||||
<set>
|
||||
<value>RECORD_FOLDER</value>
|
||||
<value>RECORD</value>
|
||||
</set>
|
||||
</property>
|
||||
<property name="capability" value ="ExtendRetentionPeriodOrFreeze"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jsonConversionComponent.unfreezeAction"
|
||||
parent="jsonConversionComponent.baseAction">
|
||||
<property name="name" value="unfreeze"/>
|
||||
<property name="kinds">
|
||||
<set>
|
||||
<value>RECORD_FOLDER</value>
|
||||
<value>RECORD</value>
|
||||
</set>
|
||||
</property>
|
||||
<property name="capability" value ="Unfreeze"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jsonConversionComponent.reviewedAction"
|
||||
parent="jsonConversionComponent.baseAction">
|
||||
<property name="name" value="reviewed"/>
|
||||
@@ -660,28 +636,6 @@
|
||||
<property name="capability" value="ViewRecords"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jsonConversionComponent.relinquish"
|
||||
parent="jsonConversionComponent.baseAction">
|
||||
<property name="name" value="relinquish"/>
|
||||
<property name="kinds">
|
||||
<set>
|
||||
<value>HOLD</value>
|
||||
</set>
|
||||
</property>
|
||||
<property name="capability" value ="Unfreeze"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jsonConversionComponent.editReason"
|
||||
parent="jsonConversionComponent.baseAction">
|
||||
<property name="name" value="editReason"/>
|
||||
<property name="kinds">
|
||||
<set>
|
||||
<value>HOLD</value>
|
||||
</set>
|
||||
</property>
|
||||
<property name="capability" value="ViewUpdateReasonsForFreeze"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jsonConversionComponent.downloadZip"
|
||||
parent="jsonConversionComponent.baseAction">
|
||||
<property name="name" value="downloadZip"/>
|
||||
@@ -904,6 +858,17 @@
|
||||
<value>HOLD</value>
|
||||
</set>
|
||||
</property>
|
||||
<property name="capability" value ="DeleteHoldContainer"/>
|
||||
<property name="capability" value ="DeleteHold"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jsonConversionComponent.editHold"
|
||||
parent="jsonConversionComponent.baseAction">
|
||||
<property name="name" value="editHold"/>
|
||||
<property name="kinds">
|
||||
<set>
|
||||
<value>HOLD</value>
|
||||
</set>
|
||||
</property>
|
||||
<property name="capability" value ="EditHold"/>
|
||||
</bean>
|
||||
</beans>
|
@@ -142,7 +142,9 @@
|
||||
"CreateHold",
|
||||
"AddToHold",
|
||||
"RemoveFromHold",
|
||||
"FileHoldReport"
|
||||
"FileHoldReport",
|
||||
"DeleteHold",
|
||||
"EditHold"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -213,7 +215,9 @@
|
||||
"CreateHold",
|
||||
"AddToHold",
|
||||
"RemoveFromHold",
|
||||
"FileHoldReport"
|
||||
"FileHoldReport",
|
||||
"DeleteHold",
|
||||
"EditHold"
|
||||
]
|
||||
}
|
||||
]
|
@@ -161,7 +161,7 @@ public class CreateCapability extends DeclarativeCapability
|
||||
{
|
||||
return AccessDecisionVoter.ACCESS_GRANTED;
|
||||
}
|
||||
if (capabilityService.getCapability(RMPermissionModel.ADD_TO_HOLD).evaluate(destination) == AccessDecisionVoter.ACCESS_GRANTED)
|
||||
if (capabilityService.getCapability(RMPermissionModel.CREATE_HOLD).evaluate(destination) == AccessDecisionVoter.ACCESS_GRANTED)
|
||||
{
|
||||
return AccessDecisionVoter.ACCESS_GRANTED;
|
||||
}
|
||||
|
@@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2014 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
* Alfresco is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Alfresco is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.alfresco.module.org_alfresco_module_rm.patch.v22;
|
||||
|
||||
import org.alfresco.module.org_alfresco_module_rm.patch.common.CapabilityPatch;
|
||||
import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
|
||||
/**
|
||||
* RM v2.2 patch to add new hold releated capabilities.
|
||||
*
|
||||
* @author Roy Wetherall
|
||||
* @since 2.2
|
||||
*/
|
||||
public class RMv22HoldCapabilityPatch extends CapabilityPatch
|
||||
{
|
||||
/**
|
||||
* @see org.alfresco.module.org_alfresco_module_rm.patch.common.CapabilityPatch#applyCapabilityPatch(org.alfresco.service.cmr.repository.NodeRef)
|
||||
*/
|
||||
protected void applyCapabilityPatch(NodeRef filePlan)
|
||||
{
|
||||
// add new capability
|
||||
addCapability(filePlan,
|
||||
"DeleteHold",
|
||||
FilePlanRoleService.ROLE_ADMIN,
|
||||
FilePlanRoleService.ROLE_RECORDS_MANAGER);
|
||||
addCapability(filePlan,
|
||||
"EditHold",
|
||||
FilePlanRoleService.ROLE_ADMIN,
|
||||
FilePlanRoleService.ROLE_RECORDS_MANAGER);
|
||||
}
|
||||
}
|
@@ -1075,68 +1075,72 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
||||
String origionalName = (String)properties.get(PROP_ORIGIONAL_NAME);
|
||||
NodeRef originatingLocation = (NodeRef)properties.get(PROP_RECORD_ORIGINATING_LOCATION);
|
||||
|
||||
// first remove the secondary link association
|
||||
List<ChildAssociationRef> parentAssocs = nodeService.getParentAssocs(nodeRef);
|
||||
for (ChildAssociationRef childAssociationRef : parentAssocs)
|
||||
// we can only reject if the originating location is present
|
||||
if (originatingLocation != null)
|
||||
{
|
||||
if (!childAssociationRef.isPrimary() && childAssociationRef.getParentRef().equals(originatingLocation))
|
||||
// first remove the secondary link association
|
||||
List<ChildAssociationRef> parentAssocs = nodeService.getParentAssocs(nodeRef);
|
||||
for (ChildAssociationRef childAssociationRef : parentAssocs)
|
||||
{
|
||||
nodeService.removeChildAssociation(childAssociationRef);
|
||||
break;
|
||||
if (!childAssociationRef.isPrimary() && childAssociationRef.getParentRef().equals(originatingLocation))
|
||||
{
|
||||
nodeService.removeChildAssociation(childAssociationRef);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// remove all RM related aspects from the node
|
||||
Set<QName> aspects = nodeService.getAspects(nodeRef);
|
||||
for (QName aspect : aspects)
|
||||
{
|
||||
if (RM_URI.equals(aspect.getNamespaceURI()))
|
||||
|
||||
// remove all RM related aspects from the node
|
||||
Set<QName> aspects = nodeService.getAspects(nodeRef);
|
||||
for (QName aspect : aspects)
|
||||
{
|
||||
// remove the aspect
|
||||
nodeService.removeAspect(nodeRef, aspect);
|
||||
if (RM_URI.equals(aspect.getNamespaceURI()))
|
||||
{
|
||||
// remove the aspect
|
||||
nodeService.removeAspect(nodeRef, aspect);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// get the records primary parent association
|
||||
ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(nodeRef);
|
||||
|
||||
// move the record into the collaboration site
|
||||
nodeService.moveNode(nodeRef, originatingLocation, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName());
|
||||
|
||||
// rename to the origional name
|
||||
if (origionalName != null)
|
||||
{
|
||||
fileFolderService.rename(nodeRef, origionalName);
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
|
||||
// get the records primary parent association
|
||||
ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(nodeRef);
|
||||
|
||||
// move the record into the collaboration site
|
||||
nodeService.moveNode(nodeRef, originatingLocation, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName());
|
||||
|
||||
// rename to the origional name
|
||||
if (origionalName != null)
|
||||
{
|
||||
String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
|
||||
logger.debug("Rename " + name + " to " + origionalName);
|
||||
fileFolderService.rename(nodeRef, origionalName);
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
|
||||
logger.debug("Rename " + name + " to " + origionalName);
|
||||
}
|
||||
}
|
||||
|
||||
// save the information about the rejection details
|
||||
Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(3);
|
||||
aspectProperties.put(PROP_RECORD_REJECTION_USER_ID, userId);
|
||||
aspectProperties.put(PROP_RECORD_REJECTION_DATE, new Date());
|
||||
aspectProperties.put(PROP_RECORD_REJECTION_REASON, reason);
|
||||
nodeService.addAspect(nodeRef, ASPECT_RECORD_REJECTION_DETAILS, aspectProperties);
|
||||
|
||||
// Restore the owner of the document
|
||||
if (StringUtils.isBlank(documentOwner))
|
||||
{
|
||||
throw new AlfrescoRuntimeException("Unable to find the creator of document.");
|
||||
}
|
||||
ownableService.setOwner(nodeRef, documentOwner);
|
||||
|
||||
// clear the existing permissions
|
||||
permissionService.clearPermission(nodeRef, null);
|
||||
|
||||
// restore permission inheritance
|
||||
permissionService.setInheritParentPermissions(nodeRef, true);
|
||||
|
||||
// send an email to the record creator
|
||||
notificationHelper.recordRejectedEmailNotification(nodeRef, recordId, documentOwner);
|
||||
}
|
||||
|
||||
// save the information about the rejection details
|
||||
Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(3);
|
||||
aspectProperties.put(PROP_RECORD_REJECTION_USER_ID, userId);
|
||||
aspectProperties.put(PROP_RECORD_REJECTION_DATE, new Date());
|
||||
aspectProperties.put(PROP_RECORD_REJECTION_REASON, reason);
|
||||
nodeService.addAspect(nodeRef, ASPECT_RECORD_REJECTION_DETAILS, aspectProperties);
|
||||
|
||||
// Restore the owner of the document
|
||||
if (StringUtils.isBlank(documentOwner))
|
||||
{
|
||||
throw new AlfrescoRuntimeException("Unable to find the creator of document.");
|
||||
}
|
||||
ownableService.setOwner(nodeRef, documentOwner);
|
||||
|
||||
// clear the existing permissions
|
||||
permissionService.clearPermission(nodeRef, null);
|
||||
|
||||
// restore permission inheritance
|
||||
permissionService.setInheritParentPermissions(nodeRef, true);
|
||||
|
||||
// send an email to the record creator
|
||||
notificationHelper.recordRejectedEmailNotification(nodeRef, recordId, documentOwner);
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
@@ -94,8 +94,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
|
||||
return new String[]
|
||||
{
|
||||
"classpath:alfresco/application-context.xml",
|
||||
"classpath:test-context.xml",
|
||||
"classpath:test-job-context.xml"
|
||||
"classpath:test-context.xml"
|
||||
};
|
||||
}
|
||||
protected ApplicationContext applicationContext;
|
||||
|
Reference in New Issue
Block a user