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

RM-1429 (The user with read-only permissions on the item can unfreeze it via deleting hold)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@72277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-05-29 23:05:35 +00:00
parent 885847135d
commit 2d2227e47a
6 changed files with 130 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/action-service.properties
View File

@@ -35,4 +35,5 @@ rm.action.undo-not-last=The cut off can't be undone, because the last dispositio
rm.action.records_only_undeclared=Only records can be completed.
rm.action.event-not-undone=The event {0} can't be undone, because it's not defined on the disposition lifecycle.
rm.action.node-not-record-category=The disposition schedule could not be created, because the actioned upon node ({0}) was not a record category.
rm.action.parameter-not-supplied=The parameter ''{0}'' has not been supplied.
rm.action.parameter-not-supplied=The parameter ''{0}'' has not been supplied.
rm.action.delete-not-hold-type=The hold couldn't be deleted, because the node isn't of type {0}. (actionedUponNodeRef={1})

34
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
View File

@@ -139,6 +139,7 @@
<property name="parameterProcessorComponent" ref="parameterProcessorComponent"/>
<property name="modelSecurityService" ref="modelSecurityService" />
<property name="recordFolderService" ref="RecordFolderService" />
<property name="holdService" ref="HoldService" />
</bean>
<bean id="rmProxyAction"
@@ -1054,12 +1055,12 @@
<bean id="addRecordTypes" class="org.alfresco.module.org_alfresco_module_rm.action.impl.AddRecordTypeAction" parent="rmAction">
<property name="publicAction" value="true"/>
</bean>
<!-- file report action -->
<bean id="fileReport"
class="org.alfresco.module.org_alfresco_module_rm.action.impl.FileReportAction"
parent="rmAction">
parent="rmAction">
<property name="reportService" ref="ReportService" />
<property name="publicAction" value="false"/>
</bean>
@@ -1074,7 +1075,7 @@
</list>
</property>
</bean>
<bean id="fileReport_security" parent="actionSecurity">
<property name="objectDefinitionSource">
<value>
@@ -1085,4 +1086,29 @@
</property>
</bean>
<bean id="deleteHold" class="org.alfresco.module.org_alfresco_module_rm.action.impl.DeleteHoldAction" parent="rmAction">
<property name="auditedImmediately" value="true"/>
</bean>
<bean id="deleteHold_proxy" parent="rmProxyAction" >
<property name="target">
<ref bean="deleteHold"/>
</property>
<property name="interceptorNames">
<list>
<idref bean="deleteHold_security"/>
</list>
</property>
</bean>
<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.*=RM_ALLOW
org.alfresco.repo.action.executer.ActionExecuter.*=RM_ALLOW
</value>
</property>
</bean>
</beans>

13
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
View File

@@ -895,4 +895,15 @@
</property>
<property name="capability" value ="FileHoldReport"/>
</bean>
</beans>
<bean id="jsonConversionComponent.deleteHold"
parent="jsonConversionComponent.baseAction">
<property name="name" value="deleteHold"/>
<property name="kinds">
<set>
<value>HOLD</value>
</set>
</property>
<property name="capability" value ="DeleteHoldContainer"/>
</bean>
</beans>

13
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java
View File

@@ -30,6 +30,7 @@ import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService
import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanComponentKind;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
@@ -113,6 +114,9 @@ public abstract class RMActionExecuterAbstractBase extends PropertySubActionExe
/** Record folder service */
protected RecordFolderService recordFolderService;
/** Hold service */
protected HoldService holdService;
/** List of kinds for which this action is applicable */
protected Set<FilePlanComponentKind> applicableKinds = new HashSet<FilePlanComponentKind>();
@@ -204,7 +208,6 @@ public abstract class RMActionExecuterAbstractBase extends PropertySubActionExe
this.recordsManagementEventService = recordsManagementEventService;
}
/**
* Set the ownable service
* @param ownableSerice
@@ -266,6 +269,14 @@ public abstract class RMActionExecuterAbstractBase extends PropertySubActionExe
this.recordFolderService = recordFolderService;
}
/**
* @param holdService hold service
*/
public void setHoldService(HoldService holdService)
{
this.holdService = holdService;
}
/**
* @param applicableKinds kinds that this action is applicable for
*/

53
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeleteHoldAction.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* 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.action.impl;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.repository.NodeRef;
/**
* Delete Hold Action
*
* @author Tuna Aksoy
* @since 2.2
* @version 1.0
*/
public class DeleteHoldAction extends RMActionExecuterAbstractBase
{
/** I18N */
private static final String MSG_DELETE_NOT_HOLD_TYPE = "rm.action.delete-not-hold-type";
/**
* @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
{
if (holdService.isHold(actionedUponNodeRef))
{
holdService.deleteHold(actionedUponNodeRef);
}
else
{
throw new AlfrescoRuntimeException(MSG_DELETE_NOT_HOLD_TYPE, new Object[]{ TYPE_HOLD.toString(), actionedUponNodeRef.toString() });
}
}
}

21
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
View File

@@ -418,6 +418,27 @@ public class HoldServiceImpl extends ServiceBaseImpl
throw new AlfrescoRuntimeException("Can't delete hold, becuase passed node is not a hold. (hold=" + hold.toString() + ")");
}
List<NodeRef> held = getHeld(hold);
List<String> heldNames = new ArrayList<String>();
for (NodeRef nodeRef : held)
{
if (permissionService.hasPermission(hold, RMPermissionModel.FILING) == AccessStatus.ALLOWED)
{
heldNames.add((String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME));
}
}
if (heldNames.size() > 0)
{
StringBuilder sb = new StringBuilder();
for (String name : heldNames)
{
sb.append("\n ");
sb.append(name);
}
throw new AlfrescoRuntimeException("Can't delete hold, because filing permissions for the following items are needed: " + sb.toString());
}
// delete the hold node
nodeService.deleteNode(hold);
}