diff options
author | st782s <statta@research.att.com> | 2017-07-14 14:19:22 -0400 |
---|---|---|
committer | st782s <statta@research.att.com> | 2017-07-14 14:29:49 -0400 |
commit | 3aec9d2ab7f373a12e052d5e2c1c59b2a19770dc (patch) | |
tree | fd13e4b474891a3efa1320524026d7ddad757297 /ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/RoleController.java | |
parent | 30b8e1fd4328ea37fc5599f8a9723ea79ae0e369 (diff) |
[Portal 21] Role management
This push includes continuation of the changes required to handle
cetralized roles,user management
Change-Id: I38e9dc946ff53ac61dd3b580c335f4ad52b372f7
Signed-off-by: st782s <statta@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/RoleController.java')
-rw-r--r-- | ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/RoleController.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/RoleController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/RoleController.java index 0fc4edc4..5d12f4aa 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/RoleController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/RoleController.java @@ -149,15 +149,19 @@ public class RoleController extends RestrictedBaseController { domainRole = new Role(); domainRole.setName(role.getName()); domainRole.setPriority(role.getPriority()); - if (role.getChildRoles().size() > 0) { + if(role.getChildRoles() != null && role.getChildRoles().size() > 0 ){ +// if (role.getChildRoles().size() > 0 ) { for (Object childRole : childRoles) { domainRole.addChildRole((Role) childRole); } +// } } - if (role.getRoleFunctions().size() > 0) { + if(role.getRoleFunctions() != null && role.getRoleFunctions().size() > 0){ +// if (role.getRoleFunctions().size() > 0) { for (Object roleFunction : roleFunctions) { domainRole.addRoleFunction((RoleFunction) roleFunction); } +// } } } |