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

MNT-22138: [AGS] Document Filed to RM File Plan under categories with cut off retention schedule no longer accessible to non admin users in collab site

Browse Source 
- Adressed review comments and fixed ui test
This commit is contained in:
Raluca Munteanu
2021-04-26 14:46:46 +03:00
parent c9f6293c26
commit 6cdf326412
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

@@ -925,7 +925,8 @@ public class DispositionServiceImpl extends ServiceBaseImpl
if (asOfDateInPast && !combineSteps) if (asOfDateInPast && !combineSteps)
{ {
return true; return true;
} else if (!asOfDateInPast && combineSteps) }
else if (!asOfDateInPast && combineSteps)
{ {
return false; 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()) 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("combineDispositionStepConditions", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_COMBINE_DISPOSITION_STEP_CONDITIONS));
properties.put("incompleteDispositionEvent", details.getEventName()); properties.put("incompleteDispositionEvent", details.getEventName());
properties.put("dispositionEventCombination", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_DISPOSITION_EVENT_COMBINATION)); properties.put("dispositionEventCombination", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_DISPOSITION_EVENT_COMBINATION));