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-5733 Removed unused parameter allowContextFromAsOf.

Browse Source
This commit is contained in:
Roxana Lucanu-Ghetu
2018-02-04 21:52:46 +02:00
parent 4c42b2cdf6
commit 46e56fa7a4
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -231,7 +231,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
DispositionActionDefinition nextDispositionActionDefinition = dispositionActionDefinitions.get(0); DispositionActionDefinition nextDispositionActionDefinition = dispositionActionDefinitions.get(0);
// initialise the details of the next disposition action // initialise the details of the next disposition action
initialiseDispositionAction(nodeRef, nextDispositionActionDefinition, true); initialiseDispositionAction(nodeRef, nextDispositionActionDefinition);
} }
} }
} }
@@ -700,7 +700,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
* @param nodeRef node reference * @param nodeRef node reference
* @param dispositionActionDefinition disposition action definition * @param dispositionActionDefinition disposition action definition
*/ */
private DispositionAction initialiseDispositionAction(NodeRef nodeRef, DispositionActionDefinition dispositionActionDefinition, boolean allowContextFromAsOf) private DispositionAction initialiseDispositionAction(NodeRef nodeRef, DispositionActionDefinition dispositionActionDefinition)
{ {
List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(nodeRef, ASSOC_NEXT_DISPOSITION_ACTION, ASSOC_NEXT_DISPOSITION_ACTION, 1, true); List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(nodeRef, ASSOC_NEXT_DISPOSITION_ACTION, ASSOC_NEXT_DISPOSITION_ACTION, 1, true);
if (childAssocs != null && !childAssocs.isEmpty()) if (childAssocs != null && !childAssocs.isEmpty())
@@ -745,7 +745,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl
* *
* @param nodeRef The node which the schedule applies to. * @param nodeRef The node which the schedule applies to.
* @param dispositionActionDefinition The definition of the disposition action. * @param dispositionActionDefinition The definition of the disposition action.
* @param allowContextFromAsOf true if the context date is allowed to be obtained from the disposition "as of" property.
* @return The new "disposition as of" date. * @return The new "disposition as of" date.
*/ */
@Override @Override
@@ -761,8 +760,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl
// Get the period properties value // Get the period properties value
QName periodProperty = dispositionActionDefinition.getPeriodProperty(); QName periodProperty = dispositionActionDefinition.getPeriodProperty();
if (periodProperty != null) if (periodProperty != null)
// && (allowContextFromAsOf
// || !RecordsManagementModel.PROP_DISPOSITION_AS_OF.equals(periodProperty)))
{ {
if (RecordsManagementModel.PROP_DISPOSITION_AS_OF.equals(periodProperty)) if (RecordsManagementModel.PROP_DISPOSITION_AS_OF.equals(periodProperty))
{ {
@@ -1032,7 +1029,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
nodeService.addAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE, null); nodeService.addAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE, null);
} }
initialiseDispositionAction(nodeRef, nextDispositionActionDefinition, false); initialiseDispositionAction(nodeRef, nextDispositionActionDefinition);
} }
} }
@@ -1327,7 +1324,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
{ {
recordOrFolder = folder; recordOrFolder = folder;
} }
DispositionAction firstDispositionAction = initialiseDispositionAction(recordOrFolder, firstDispositionActionDef, true); DispositionAction firstDispositionAction = initialiseDispositionAction(recordOrFolder, firstDispositionActionDef);
newAction = firstDispositionAction.getNodeRef(); newAction = firstDispositionAction.getNodeRef();
newDispositionActionName = (String)nodeService.getProperty(newAction, PROP_DISPOSITION_ACTION_NAME); newDispositionActionName = (String)nodeService.getProperty(newAction, PROP_DISPOSITION_ACTION_NAME);
newDispositionActionDateAsOf = firstDispositionAction.getAsOfDate(); newDispositionActionDateAsOf = firstDispositionAction.getAsOfDate();