Federico Simoncelli has uploaded a new change for review.
Change subject: frontend: identify user roles using enum values
......................................................................
frontend: identify user roles using enum values
Additional ActionGroups now returned by getUserActionGroups:
CONSUME_QUOTA
ActionGroups that now are no longer returned by getUserActionGroups:
CHANGE_VM_CUSTOM_PROPERTIES
EDIT_ADMIN_VM_PROPERTIES
EDIT_ADMIN_TEMPLATE_PROPERTIES
Change-Id: I2de0478fc80952c9a5816bd58a1d000df77a6681
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
1 file changed, 10 insertions(+), 33 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/18145/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
index 0205596..12cd987 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
+import org.ovirt.engine.core.common.businessentities.RoleType;
import org.ovirt.engine.core.common.mode.ApplicationMode;
import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper;
import org.ovirt.engine.ui.uicommonweb.models.common.SelectionTreeNodeModel;
@@ -77,39 +78,15 @@
}
private static ArrayList<ActionGroup> getUserActionGroups() {
- ArrayList<ActionGroup> array = new ArrayList<ActionGroup>();
- array.add(ActionGroup.CREATE_VM);
- array.add(ActionGroup.DELETE_VM);
- array.add(ActionGroup.EDIT_VM_PROPERTIES);
- array.add(ActionGroup.VM_BASIC_OPERATIONS);
- array.add(ActionGroup.CHANGE_VM_CD);
- array.add(ActionGroup.MIGRATE_VM);
- array.add(ActionGroup.CONNECT_TO_VM);
- array.add(ActionGroup.CONFIGURE_VM_NETWORK);
- array.add(ActionGroup.CONFIGURE_VM_STORAGE);
- array.add(ActionGroup.MOVE_VM);
- array.add(ActionGroup.MANIPULATE_VM_SNAPSHOTS);
- array.add(ActionGroup.CREATE_TEMPLATE);
- array.add(ActionGroup.EDIT_TEMPLATE_PROPERTIES);
- array.add(ActionGroup.DELETE_TEMPLATE);
- array.add(ActionGroup.COPY_TEMPLATE);
- array.add(ActionGroup.CONFIGURE_TEMPLATE_NETWORK);
- array.add(ActionGroup.CREATE_VM_POOL);
- array.add(ActionGroup.EDIT_VM_POOL_CONFIGURATION);
- array.add(ActionGroup.DELETE_VM_POOL);
- array.add(ActionGroup.VM_POOL_BASIC_OPERATIONS);
- array.add(ActionGroup.MANIPULATE_PERMISSIONS);
- array.add(ActionGroup.CREATE_DISK);
- array.add(ActionGroup.ATTACH_DISK);
- array.add(ActionGroup.DELETE_DISK);
- array.add(ActionGroup.CONFIGURE_DISK_STORAGE);
- array.add(ActionGroup.EDIT_DISK_PROPERTIES);
- array.add(ActionGroup.LOGIN);
- array.add(ActionGroup.CHANGE_VM_CUSTOM_PROPERTIES);
- array.add(ActionGroup.EDIT_ADMIN_VM_PROPERTIES);
- array.add(ActionGroup.RECONNECT_TO_VM);
- array.add(ActionGroup.EDIT_ADMIN_TEMPLATE_PROPERTIES);
- return array;
+ ArrayList<ActionGroup> userActionGroups = new ArrayList<ActionGroup>();
+
+ for (ActionGroup actionGroup : ActionGroup.values()) {
+ if (actionGroup.getRoleType() == RoleType.USER) {
+ userActionGroups.add(actionGroup);
+ }
+ }
+
+ return userActionGroups;
}
private static RoleNode initTreeView()
--
To view, visit http://gerrit.ovirt.org/18145
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2de0478fc80952c9a5816bd58a1d000df77a6681
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
