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-996: Reject action is available for destruction report

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56136 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-30 00:16:32 +00:00
parent 565f2479d7
commit 070b3cf91e
4 changed files with 97 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsPropertySetCondition.java Normal file
View File

@@ -0,0 +1,83 @@
/*
* Copyright (C) 2005-2013 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.capability.declarative.condition;
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ParameterCheck;
/**
* Indicates whether a property is set or not.
*
* @author Roy Wetherall
* @since 2.1
*/
public class IsPropertySetCondition extends AbstractCapabilityCondition
{
/** property name (eg: rma:location) */
private String propertyName;
/** namespace service */
private NamespaceService namespaceService;
/**
* @param propertyName property name (eg: rma:location)
*/
public void setPropertyName(String propertyName)
{
this.propertyName = propertyName;
}
/**
* @param namespaceService namespace service
*/
public void setNamespaceService(NamespaceService namespaceService)
{
this.namespaceService = namespaceService;
}
/**
* @return QName property qname
*/
protected QName getPropertyQName()
{
return QName.createQName(propertyName, namespaceService);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);
boolean result = false;
if (nodeService.getProperty(nodeRef, getPropertyQName()) != null)
{
result = true;
}
return result;
}
}

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java
View File

@@ -102,7 +102,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
for (NodeRef node : resultNodes)
{
final NodeRef currentNode = node;
RetryingTransactionCallback<Boolean> processTranCB = new RetryingTransactionCallback<Boolean>()
{
public Boolean execute() throws Throwable
@@ -138,7 +138,11 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
/**
* Now do the work, one action in each transaction
*/
retryingTransactionHelper.doInTransaction(processTranCB);
if (nodeService.exists(currentNode) == false)
{
retryingTransactionHelper.doInTransaction(processTranCB);
}
}
logger.debug("Job Finished");