Moti Asayag has uploaded a new change for review. Change subject: webadmin: Add vnic profile action groups to roles tree ......................................................................
webadmin: Add vnic profile action groups to roles tree The vnic profiles action groups were added to the roles tree in order to better describe the actions supported by an existing roles or to enable creation of a custom role which includes any of these action groups. Change-Id: I56ba098f8b0b8e1f94aa7ec82b3612a6a81365d6 Bug-Url: https://bugzilla.redhat.com/1002483 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties 3 files changed, 36 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/19526/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 ea758d0..29880cd 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 @@ -10,7 +10,6 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.UIConstants; -@SuppressWarnings("unused") public class RoleTreeView { public static ArrayList<SelectionTreeNodeModel> getRoleTreeView(boolean isReadOnly, boolean isAdmin) @@ -240,19 +239,28 @@ protected static RoleNode createNetworkRoleTree() { return new RoleNode(getConstants().networkRoleTree(), - new RoleNode[] { new RoleNode(getConstants().configureNetworkRoleTree(), new RoleNode[] { - new RoleNode(ActionGroup.CREATE_STORAGE_POOL_NETWORK, - getConstants().allowToCreateLogicalNetworkPerDataCenterRoleTreeTooltip()), - new RoleNode(ActionGroup.CONFIGURE_STORAGE_POOL_NETWORK, - getConstants().allowToEditLogicalNetworkRoleTreeTooltip()), - new RoleNode(ActionGroup.DELETE_STORAGE_POOL_NETWORK, - getConstants().allowToDeleteLogicalNetworkRoleTreeTooltip()), - new RoleNode(ActionGroup.ASSIGN_CLUSTER_NETWORK, - getConstants().allowToAddRemoveLogicalNetworksForTheClusterRoleTreeTooltip()), - new RoleNode(ActionGroup.CONFIGURE_VM_NETWORK, - getConstants().allowToConfigureVMsNetworkRoleTreeTooltip()), - new RoleNode(ActionGroup.CONFIGURE_TEMPLATE_NETWORK, - getConstants().allowToConfigureTemlateNetworkRoleTreeTooltip()) }) }); + new RoleNode[] { + new RoleNode(getConstants().configureNetworkRoleTree(), new RoleNode[] { + new RoleNode(ActionGroup.CREATE_STORAGE_POOL_NETWORK, + getConstants().allowToCreateLogicalNetworkPerDataCenterRoleTreeTooltip()), + new RoleNode(ActionGroup.CONFIGURE_STORAGE_POOL_NETWORK, + getConstants().allowToEditLogicalNetworkRoleTreeTooltip()), + new RoleNode(ActionGroup.DELETE_STORAGE_POOL_NETWORK, + getConstants().allowToDeleteLogicalNetworkRoleTreeTooltip()), + new RoleNode(ActionGroup.ASSIGN_CLUSTER_NETWORK, + getConstants().allowToAddRemoveLogicalNetworksForTheClusterRoleTreeTooltip()) }), + new RoleNode(getConstants().configureVnicProfileRoleTree(), new RoleNode[] { + new RoleNode(ActionGroup.CREATE_NETWORK_VNIC_PROFILE, + getConstants().allowToCreateVnicProfileRoleTreeTooltip()), + new RoleNode(ActionGroup.CONFIGURE_NETWORK_VNIC_PROFILE, + getConstants().allowToEditVnicProfileRoleTreeTooltip()), + new RoleNode(ActionGroup.DELETE_NETWORK_VNIC_PROFILE, + getConstants().allowToDeleteVnicProfileRoleTreeTooltip()), + new RoleNode(ActionGroup.CONFIGURE_VM_NETWORK, + getConstants().allowToConfigureVMsNetworkRoleTreeTooltip()), + new RoleNode(ActionGroup.CONFIGURE_TEMPLATE_NETWORK, + getConstants().allowToConfigureTemlateNetworkRoleTreeTooltip()) }) + }); } protected static RoleNode createDataCenterRoleTree() { diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index f01cf7e..6c04e3b 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -1126,6 +1126,15 @@ @DefaultStringValue("Allow to delete Logical Network") String allowToDeleteLogicalNetworkRoleTreeTooltip(); + @DefaultStringValue("Allow to create vNIC Profile") + String allowToCreateVnicProfileRoleTreeTooltip(); + + @DefaultStringValue("Allow to edit vNIC Profile") + String allowToEditVnicProfileRoleTreeTooltip(); + + @DefaultStringValue("Allow to delete vNIC Profile") + String allowToDeleteVnicProfileRoleTreeTooltip(); + @DefaultStringValue("Allow to create Storage Domain") String allowToCreateStorageDomainRoleTreeTooltip(); @@ -1404,6 +1413,9 @@ @DefaultStringValue("Configure Network") String configureNetworkRoleTree(); + @DefaultStringValue("Configure vNIC Profile") + String configureVnicProfileRoleTree(); + @DefaultStringValue("Storage Domain") String storageDomainRoleTree(); diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties index 681fbb2..48a0edf 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties @@ -32,7 +32,7 @@ ActionGroup___DELETE_TEMPLATE=Delete ActionGroup___EDIT_TEMPLATE_PROPERTIES=Edit Properties ActionGroup___EDIT_ADMIN_TEMPLATE_PROPERTIES=Edit administrative properties -ActionGroup___CONFIGURE_TEMPLATE_NETWORK=Assign Network to Template +ActionGroup___CONFIGURE_TEMPLATE_NETWORK=Assign vNIC Profile to Template ActionGroup___COPY_TEMPLATE=Copy ActionGroup___CREATE_CLUSTER=Create ActionGroup___DELETE_CLUSTER=Delete @@ -52,7 +52,7 @@ ActionGroup___CHANGE_VM_CUSTOM_PROPERTIES=Edit custom properties ActionGroup___EDIT_ADMIN_VM_PROPERTIES=Edit administrative properties ActionGroup___IMPORT_EXPORT_VM=Import/Export -ActionGroup___CONFIGURE_VM_NETWORK=Assign Network to VM +ActionGroup___CONFIGURE_VM_NETWORK=Assign vNIC Profile to VM ActionGroup___CONFIGURE_VM_STORAGE=Edit Storage ActionGroup___VM_BASIC_OPERATIONS=Basic Operations ActionGroup___CHANGE_VM_CD=Change CD -- To view, visit http://gerrit.ovirt.org/19526 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56ba098f8b0b8e1f94aa7ec82b3612a6a81365d6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
