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

Merge branch 'feature/MNT-22138_fixAfterFailingTests' into feature/RM-7103

Browse Source
This commit is contained in:
Raluca Munteanu
2021-04-27 08:37:35 +03:00
parent 20616495ad 6cdf326412
commit acab30c406
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -930,7 +930,8 @@ public class DispositionServiceImpl extends ServiceBaseImpl
if (asOfDateInPast && !combineSteps)
{
return true;
} else if (!asOfDateInPast && combineSteps)
}
else if (!asOfDateInPast && combineSteps)
{
return false;
}

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
View File

@@ -521,7 +521,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS
{
if (!details.isEventComplete())
{
HashMap properties = ((HashMap) rmNodeValues.get("properties"));
HashMap properties = (HashMap) rmNodeValues.get("properties");
properties.put("combineDispositionStepConditions", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_COMBINE_DISPOSITION_STEP_CONDITIONS));
properties.put("incompleteDispositionEvent", details.getEventName());
properties.put("dispositionEventCombination", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_DISPOSITION_EVENT_COMBINATION));