hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #179 from KevinVdV/DS-1416

Browse Source 
[DS-1416] NPE when removing roles from Collection workflow steps
This commit is contained in:
helix84
2013-01-28 13:22:39 -08:00
parent db1ef2131f 645141bff3
commit 0fd85092c6
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowContainerUtils.java
View File

@@ -535,21 +535,24 @@ public class FlowContainerUtils
collection.removeSubmitters(); collection.removeSubmitters();
} }
else{ else{
WorkflowUtils.deleteRoleGroup(context, collection, roleName); if(ConfigurationManager.getProperty("workflow", "workflow.framework").equals("xmlworkflow"))
{
WorkflowUtils.deleteRoleGroup(context, collection, roleName);
}else{
if (ROLE_WF_STEP1.equals(roleName))
{
collection.setWorkflowGroup(1, null);
}
else if (ROLE_WF_STEP2.equals(roleName))
{
collection.setWorkflowGroup(2, null);
}
else if (ROLE_WF_STEP3.equals(roleName))
{
collection.setWorkflowGroup(3, null);
}
}
} }
// else if (ROLE_WF_STEP1.equals(roleName))
// {
// collection.setWorkflowGroup(1, null);
// }
// else if (ROLE_WF_STEP2.equals(roleName))
// {
// collection.setWorkflowGroup(2, null);
// }
// else if (ROLE_WF_STEP3.equals(roleName))
// {
// collection.setWorkflowGroup(3, null);
//
// }
// Second, remove all authorizations for this role by searching for all policies that this // Second, remove all authorizations for this role by searching for all policies that this
// group has on the collection and remove them otherwise the delete will fail because // group has on the collection and remove them otherwise the delete will fail because