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

Renamed method for calculating next disposition step and added null check.

Browse Source
This commit is contained in:
roxana
2016-10-31 14:41:58 +02:00
parent adc144e971
commit 0a79d24def
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -142,7 +142,7 @@
org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.updateDispositionActionDefinition=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.updateDispositionActionDefinition=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.isNextDispositionActionEligible=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.isNextDispositionActionEligible=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getNextDispositionAction=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getNextDispositionAction=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.updateDispositionWhenLinkingOrUnlinking=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.recalculateNextDispositionStep=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getCompletedDispositionActions=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getCompletedDispositionActions=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getLastCompletedDispostionAction=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getLastCompletedDispostionAction=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.isDisposableItemCutoff=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.isDisposableItemCutoff=RM.Read.0

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java
View File

@@ -271,5 +271,5 @@ public interface DispositionService
* *
* @param record * @param record
*/ */
void updateDispositionWhenLinkingOrUnlinking(NodeRef record); void recalculateNextDispositionStep(NodeRef record);
} }

5
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -1095,12 +1095,14 @@ public class DispositionServiceImpl extends ServiceBaseImpl
return null; return null;
} }
public void updateDispositionWhenLinkingOrUnlinking(NodeRef record) public void recalculateNextDispositionStep(NodeRef record)
{ {
List<NodeRef> recordFolders = recordFolderService.getRecordFolders(record); List<NodeRef> recordFolders = recordFolderService.getRecordFolders(record);
DispositionAction nextDispositionAction = getNextDispositionAction(record); DispositionAction nextDispositionAction = getNextDispositionAction(record);
if (nextDispositionAction != null)
{
NextActionFromDisposition dsNextAction = getNextDispositionAction(record, recordFolders, nextDispositionAction); NextActionFromDisposition dsNextAction = getNextDispositionAction(record, recordFolders, nextDispositionAction);
final NodeRef action = dsNextAction.getNextActionNodeRef(); final NodeRef action = dsNextAction.getNextActionNodeRef();
final Date dispositionActionDate = dsNextAction.getNextActionDateAsOf(); final Date dispositionActionDate = dsNextAction.getNextActionDateAsOf();
@@ -1114,6 +1116,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
} }
}); });
} }
}
/** /**
* Helper method to determine if a node is frozen or has frozen children * Helper method to determine if a node is frozen or has frozen children

6
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -546,7 +546,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
// create and file the content as a record // create and file the content as a record
file(nodeRef); file(nodeRef);
// recalculate disposition schedule for the record when linking it // recalculate disposition schedule for the record when linking it
dispositionService.updateDispositionWhenLinkingOrUnlinking(nodeRef); dispositionService.recalculateNextDispositionStep(nodeRef);
} }
} }
} }
@@ -1720,7 +1720,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name)); QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name));
// recalculate disposition schedule for the record when linking it // recalculate disposition schedule for the record when linking it
dispositionService.updateDispositionWhenLinkingOrUnlinking(record); dispositionService.recalculateNextDispositionStep(record);
} }
else else
{ {
@@ -1779,7 +1779,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
nodeService.removeChild(recordFolder, record); nodeService.removeChild(recordFolder, record);
// recalculate disposition schedule for record after unlinking it // recalculate disposition schedule for record after unlinking it
dispositionService.updateDispositionWhenLinkingOrUnlinking(record); dispositionService.recalculateNextDispositionStep(record);
} }
else else
{ {