1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00

Bug #4674: Fix user view, update other view contents to match the original admin.yaml better

(cherry picked from commit 4f0d75d1ea102a539500160a5c1a615bff9df135)
This commit is contained in:
Carlos Martín 2016-07-22 12:28:30 +02:00
parent 347435ecc4
commit 03add2e601
5 changed files with 171 additions and 173 deletions

View File

@ -122,7 +122,6 @@ tabs:
- 5 # Memory
- 6 # CPU
#- 7 # Labels
#- 8 # Search data
actions:
Group.refresh: true
Group.create_dialog: true
@ -147,7 +146,6 @@ tabs:
- 6 # VNets
- 7 # Datastores
#- 8 # Labels
#- 9 # Search data
actions:
Vdc.refresh: true
Vdc.create_dialog: true
@ -186,7 +184,7 @@ tabs:
- 4 # Name
- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
#- 7 # Search data
actions:
Template.refresh: true
Template.create_dialog: true
@ -252,7 +250,7 @@ tabs:
- 4 # Name
- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
#- 7 # Search data
actions:
VirtualRouterTemplate.refresh: true
VirtualRouterTemplate.create_dialog: true
@ -309,7 +307,7 @@ tabs:
- 11 # VNC
#- 12 # Hidden Template
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
VM.refresh: true
VM.create_dialog: true
@ -410,6 +408,30 @@ tabs:
Service.delete: true
Service.edit_labels: true
Service.menu_labels: true
vrouters-tab:
panel_tabs:
virtual_router_info_tab: true
virtual_router_vms_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
actions:
VirtualRouter.refresh: true
VirtualRouter.create_dialog: true
VirtualRouter.rename: true
VirtualRouter.chown: true
VirtualRouter.chgrp: true
VirtualRouter.chmod: true
VirtualRouter.delete: true
VirtualRouter.attachnic: true
VirtualRouter.detachnic: true
VirtualRouter.edit_labels: true
VirtualRouter.menu_labels: true
infrastructure-top-tab:
panel_tabs:
actions:
@ -548,8 +570,8 @@ tabs:
actions:
Image.refresh: true
Image.create_dialog: true
Image.upload_marketplace_dialog: false
Image.import_dialog: true
Image.upload_marketplace_dialog: false
Image.rename: true
Image.chown: true
Image.chgrp: true
@ -699,30 +721,6 @@ tabs:
Network.update_ar: true
Network.edit_labels: true
Network.menu_labels: true
vrouters-tab:
panel_tabs:
virtual_router_info_tab: true
virtual_router_vms_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
actions:
VirtualRouter.refresh: true
VirtualRouter.create_dialog: true
VirtualRouter.rename: true
VirtualRouter.chown: true
VirtualRouter.chgrp: true
VirtualRouter.chmod: true
VirtualRouter.delete: true
VirtualRouter.attachnic: true
VirtualRouter.detachnic: true
VirtualRouter.edit_labels: true
VirtualRouter.menu_labels: true
vnets-topology-tab:
panel_tabs:
actions:

View File

@ -123,12 +123,12 @@ tabs:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
- 3 # Group
#- 3 # Group
- 4 # Name
- 5 # Reservation
- 6 # Cluster
#- 5 # Reservation
#- 6 # Cluster
#- 7 # Bridge
- 8 # Leases
#- 8 # Leases
#- 9 # VLAN ID
secgroups-tab:
table_columns:

View File

@ -10,10 +10,6 @@ enabled_tabs:
- templates-tab
- oneflow-templates-tab
- vrouter-templates-tab
#- infrastructure-top-tab
#- clusters-tab
#- hosts-tab
#- zones-tab
#- storage-top-tab
#- datastores-tab
#- images-tab
@ -24,6 +20,10 @@ enabled_tabs:
- vnets-tab
- vnets-topology-tab
- secgroups-tab
#- infrastructure-top-tab
#- clusters-tab
#- hosts-tab
#- zones-tab
- system-top-tab
- users-tab
- groups-tab
@ -31,6 +31,7 @@ enabled_tabs:
#- acls-tab
- settings-tab
#- support-tab
#- upgrade-top-tab
autorefresh: true
features:
# True to show showback monthly reports, and VM cost
@ -122,7 +123,6 @@ tabs:
- 5 # Memory
- 6 # CPU
#- 7 # Labels
#- 6 # Search data
actions:
Group.refresh: true
Group.create_dialog: false
@ -147,7 +147,6 @@ tabs:
- 6 # VNets
- 7 # Datastores
#- 8 # Labels
#- 9 # Search data
actions:
Vdc.refresh: true
Vdc.create_dialog: true
@ -226,7 +225,7 @@ tabs:
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 6 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: false
@ -309,7 +308,7 @@ tabs:
- 11 # VNC
#- 12 # Hidden Template
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
VM.refresh: true
VM.create_dialog: true
@ -397,7 +396,7 @@ tabs:
- 4 # Name
- 5 # State
#- 6 # Labels
#- 7 # Search data
#- 7 # Search data
actions:
Service.refresh: true
Service.create_dialog: true
@ -410,6 +409,30 @@ tabs:
Service.delete: true
Service.edit_labels: true
Service.menu_labels: true
vrouters-tab:
panel_tabs:
virtual_router_info_tab: true
virtual_router_vms_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
#- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
actions:
VirtualRouter.refresh: true
VirtualRouter.create_dialog: true
VirtualRouter.rename: true
VirtualRouter.chown: true
VirtualRouter.chgrp: false
VirtualRouter.chmod: false
VirtualRouter.delete: true
VirtualRouter.attachnic: false
VirtualRouter.detachnic: false
VirtualRouter.edit_labels: true
VirtualRouter.menu_labels: true
infrastructure-top-tab:
panel_tabs:
actions:
@ -459,7 +482,7 @@ tabs:
#- 11 # VM MAD
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
Host.refresh: true
Host.create_dialog: true
@ -509,7 +532,7 @@ tabs:
- 10 # Type
- 11 # Status
#- 12 # Labels
#- 13 # Search data
#- 13 # Search data
actions:
Datastore.refresh: true
Datastore.create_dialog: true
@ -544,7 +567,7 @@ tabs:
- 11 # #VMs
#- 12 # Target
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
Image.refresh: true
Image.create_dialog: true
@ -583,7 +606,7 @@ tabs:
#- 11 # #VMs
#- 12 # Target
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
File.refresh: true
File.create_dialog: true
@ -611,7 +634,7 @@ tabs:
- 7 # Driver
- 8 # Zone
#- 9 # Labels
#- 10 # Search data
#- 10 # Search data
actions:
MarketPlace.refresh: true
MarketPlace.create_dialog: true
@ -641,7 +664,7 @@ tabs:
- 10 # Marketplace
- 11 # Zone
#- 12 # Labels
#- 13 # Search data
#- 13 # Search data
actions:
MarketPlaceApp.refresh: true
MarketPlaceApp.create_dialog: true
@ -679,7 +702,7 @@ tabs:
#- 8 # Leases
#- 9 # VLAN ID
#- 10 # Labels
#- 11 # Search data
#- 11 # Search data
actions:
Network.refresh: true
Network.create_dialog: false
@ -699,30 +722,6 @@ tabs:
Network.update_ar: false
Network.edit_labels: true
Network.menu_labels: true
vrouters-tab:
panel_tabs:
virtual_router_info_tab: true
virtual_router_vms_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
#- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
actions:
VirtualRouter.refresh: true
VirtualRouter.create_dialog: true
VirtualRouter.rename: true
VirtualRouter.chown: true
VirtualRouter.chgrp: false
VirtualRouter.chmod: false
VirtualRouter.delete: true
VirtualRouter.attachnic: false
VirtualRouter.detachnic: false
VirtualRouter.edit_labels: true
VirtualRouter.menu_labels: true
vnets-topology-tab:
panel_tabs:
actions:
@ -741,7 +740,7 @@ tabs:
#- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 6 # Search data
actions:
SecurityGroup.refresh: true
SecurityGroup.create_dialog: false
@ -787,4 +786,7 @@ tabs:
Settings.ssh_key: true
Settings.login_token: true
# Edit button in user_quotas_tab
User.quotas_dialog: false
User.quotas_dialog: false
upgrade-top-tab:
panel_tabs:
actions:

View File

@ -10,10 +10,6 @@ enabled_tabs:
#- templates-tab
- oneflow-templates-tab
#- vrouter-templates-tab
#- infrastructure-top-tab
#- clusters-tab
#- hosts-tab
#- zones-tab
#- storage-top-tab
#- datastores-tab
#- images-tab
@ -24,6 +20,10 @@ enabled_tabs:
- vnets-tab
- vnets-topology-tab
#- secgroups-tab
#- infrastructure-top-tab
#- clusters-tab
#- hosts-tab
#- zones-tab
- system-top-tab
- users-tab
- groups-tab
@ -31,6 +31,7 @@ enabled_tabs:
#- acls-tab
- settings-tab
#- support-tab
#- upgrade-top-tab
autorefresh: true
features:
# True to show showback monthly reports, and VM cost
@ -102,8 +103,6 @@ tabs:
User.quotas_dialog: true
User.groups_dialog: false
User.chgrp: false
User.addgroup: false
User.delgroup: false
User.change_authentication: false
User.delete: true
User.edit_labels: true
@ -124,7 +123,6 @@ tabs:
- 5 # Memory
- 6 # CPU
#- 7 # Labels
#- 8 # Search data
actions:
Group.refresh: true
Group.create_dialog: false
@ -149,7 +147,6 @@ tabs:
- 6 # VNets
- 7 # Datastores
#- 8 # Labels
#- 9 # Search data
actions:
Vdc.refresh: true
Vdc.create_dialog: true
@ -228,7 +225,7 @@ tabs:
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 6 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: false
@ -311,7 +308,7 @@ tabs:
- 11 # VNC
#- 12 # Hidden Template
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
VM.refresh: true
VM.create_dialog: true
@ -399,7 +396,7 @@ tabs:
- 4 # Name
- 5 # State
#- 6 # Labels
#- 7 # Search data
#- 7 # Search data
actions:
Service.refresh: true
Service.create_dialog: true
@ -412,6 +409,30 @@ tabs:
Service.delete: true
Service.edit_labels: true
Service.menu_labels: true
vrouters-tab:
panel_tabs:
virtual_router_info_tab: true
virtual_router_vms_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
#- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
actions:
VirtualRouter.refresh: true
VirtualRouter.create_dialog: true
VirtualRouter.rename: true
VirtualRouter.chown: true
VirtualRouter.chgrp: false
VirtualRouter.chmod: false
VirtualRouter.delete: true
VirtualRouter.attachnic: false
VirtualRouter.detachnic: false
VirtualRouter.edit_labels: true
VirtualRouter.menu_labels: true
infrastructure-top-tab:
panel_tabs:
actions:
@ -461,7 +482,7 @@ tabs:
#- 11 # VM MAD
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
Host.refresh: true
Host.create_dialog: true
@ -511,10 +532,11 @@ tabs:
- 10 # Type
- 11 # Status
#- 12 # Labels
#- 13 # Search data
#- 13 # Search data
actions:
Datastore.refresh: true
Datastore.create_dialog: true
Datastore.import_dialog: false
Datastore.addtocluster: true
Datastore.rename: true
Datastore.chown: true
@ -545,12 +567,12 @@ tabs:
- 11 # #VMs
#- 12 # Target
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
Image.refresh: true
Image.create_dialog: true
Image.upload_marketplace_dialog: false
Image.import_dialog: true
Image.upload_marketplace_dialog: false
Image.rename: true
Image.chown: true
Image.chgrp: true
@ -584,7 +606,7 @@ tabs:
#- 11 # #VMs
#- 12 # Target
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
File.refresh: true
File.create_dialog: true
@ -612,7 +634,7 @@ tabs:
- 7 # Driver
- 8 # Zone
#- 9 # Labels
#- 10 # Search data
#- 10 # Search data
actions:
MarketPlace.refresh: true
MarketPlace.create_dialog: true
@ -642,7 +664,7 @@ tabs:
- 10 # Marketplace
- 11 # Zone
#- 12 # Labels
#- 13 # Search data
#- 13 # Search data
actions:
MarketPlaceApp.refresh: true
MarketPlaceApp.create_dialog: true
@ -680,7 +702,7 @@ tabs:
#- 8 # Leases
#- 9 # VLAN ID
#- 10 # Labels
#- 11 # Search data
#- 11 # Search data
actions:
Network.refresh: true
Network.create_dialog: false
@ -700,30 +722,6 @@ tabs:
Network.update_ar: false
Network.edit_labels: true
Network.menu_labels: true
vrouters-tab:
panel_tabs:
virtual_router_info_tab: true
virtual_router_vms_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
#- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
actions:
VirtualRouter.refresh: true
VirtualRouter.create_dialog: true
VirtualRouter.rename: true
VirtualRouter.chown: true
VirtualRouter.chgrp: false
VirtualRouter.chmod: false
VirtualRouter.delete: true
VirtualRouter.attachnic: false
VirtualRouter.detachnic: false
VirtualRouter.edit_labels: true
VirtualRouter.menu_labels: true
vnets-topology-tab:
panel_tabs:
actions:
@ -742,7 +740,7 @@ tabs:
#- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 6 # Search data
actions:
SecurityGroup.refresh: true
SecurityGroup.create_dialog: false
@ -788,4 +786,7 @@ tabs:
Settings.ssh_key: true
Settings.login_token: true
# Edit button in user_quotas_tab
User.quotas_dialog: false
User.quotas_dialog: false
upgrade-top-tab:
panel_tabs:
actions:

View File

@ -10,10 +10,6 @@ enabled_tabs:
- templates-tab
- oneflow-templates-tab
- vrouter-templates-tab
#- infrastructure-top-tab
#- clusters-tab
#- hosts-tab
#- zones-tab
- storage-top-tab
- datastores-tab
- images-tab
@ -24,6 +20,10 @@ enabled_tabs:
- vnets-tab
- vnets-topology-tab
- secgroups-tab
#- infrastructure-top-tab
#- clusters-tab
#- hosts-tab
#- zones-tab
#- system-top-tab
#- users-tab
#- groups-tab
@ -31,6 +31,7 @@ enabled_tabs:
#- acls-tab
- settings-tab
#- support-tab
#- upgrade-top-tab
autorefresh: true
features:
# True to show showback monthly reports, and VM cost
@ -101,8 +102,6 @@ tabs:
User.quotas_dialog: true
User.groups_dialog: true
User.chgrp: true
User.addgroup: true
User.delgroup: true
User.change_authentication: true
User.delete: true
User.edit_labels: true
@ -123,7 +122,6 @@ tabs:
- 5 # Memory
- 6 # CPU
#- 7 # Labels
#- 8 # Search data
actions:
Group.refresh: true
Group.create_dialog: true
@ -148,7 +146,6 @@ tabs:
- 6 # VNets
- 7 # Datastores
#- 8 # Labels
#- 9 # Search data
actions:
Vdc.refresh: true
Vdc.create_dialog: true
@ -227,7 +224,7 @@ tabs:
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 6 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: true
@ -310,7 +307,7 @@ tabs:
- 11 # VNC
#- 12 # Hidden Template
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
VM.refresh: true
VM.create_dialog: true
@ -398,7 +395,7 @@ tabs:
- 4 # Name
- 5 # State
#- 6 # Labels
#- 7 # Search data
#- 7 # Search data
actions:
Service.refresh: true
Service.create_dialog: true
@ -411,6 +408,30 @@ tabs:
Service.delete: true
Service.edit_labels: true
Service.menu_labels: true
vrouters-tab:
panel_tabs:
virtual_router_info_tab: true
virtual_router_vms_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
actions:
VirtualRouter.refresh: true
VirtualRouter.create_dialog: true
VirtualRouter.rename: true
VirtualRouter.chown: true
VirtualRouter.chgrp: true
VirtualRouter.chmod: true
VirtualRouter.delete: true
VirtualRouter.attachnic: true
VirtualRouter.detachnic: true
VirtualRouter.edit_labels: true
VirtualRouter.menu_labels: true
infrastructure-top-tab:
panel_tabs:
actions:
@ -460,7 +481,7 @@ tabs:
#- 11 # VM MAD
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
Host.refresh: true
Host.create_dialog: true
@ -510,7 +531,7 @@ tabs:
#- 10 # Type
#- 11 # Status
#- 12 # Labels
#- 13 # Search data
#- 13 # Search data
actions:
Datastore.refresh: true
Datastore.create_dialog: false
@ -545,7 +566,7 @@ tabs:
- 11 # #VMs
#- 12 # Target
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
Image.refresh: true
Image.create_dialog: true
@ -584,7 +605,7 @@ tabs:
#- 11 # #VMs
#- 12 # Target
#- 13 # Labels
#- 14 # Search data
#- 14 # Search data
actions:
File.refresh: true
File.create_dialog: true
@ -600,7 +621,7 @@ tabs:
marketplaces-tab:
panel_tabs:
marketplace_info_tab: true
marketplaces_app_tab: true
marketplace_apps_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
@ -612,7 +633,7 @@ tabs:
- 7 # Driver
- 8 # Zone
#- 9 # Labels
#- 10 # Search data
#- 10 # Search data
actions:
MarketPlace.refresh: true
MarketPlace.create_dialog: true
@ -642,7 +663,7 @@ tabs:
- 10 # Marketplace
- 11 # Zone
#- 12 # Labels
#- 13 # Search data
#- 13 # Search data
actions:
MarketPlaceApp.refresh: true
MarketPlaceApp.create_dialog: true
@ -680,7 +701,7 @@ tabs:
- 8 # Leases
#- 9 # VLAN ID
#- 10 # Labels
#- 11 # Search data
#- 11 # Search data
actions:
Network.refresh: true
Network.create_dialog: false
@ -700,30 +721,6 @@ tabs:
Network.update_ar: true
Network.edit_labels: true
Network.menu_labels: true
vrouters-tab:
panel_tabs:
virtual_router_info_tab: true
virtual_router_vms_tab: true
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
actions:
VirtualRouter.refresh: true
VirtualRouter.create_dialog: true
VirtualRouter.rename: true
VirtualRouter.chown: true
VirtualRouter.chgrp: true
VirtualRouter.chmod: true
VirtualRouter.delete: true
VirtualRouter.attachnic: true
VirtualRouter.detachnic: true
VirtualRouter.edit_labels: true
VirtualRouter.menu_labels: true
vnets-topology-tab:
panel_tabs:
actions:
@ -742,7 +739,7 @@ tabs:
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 6 # Search data
actions:
SecurityGroup.refresh: true
SecurityGroup.create_dialog: true
@ -756,10 +753,6 @@ tabs:
SecurityGroup.delete: true
SecurityGroup.edit_labels: true
SecurityGroup.menu_labels: true
oneflow-dashboard-tab:
panel_tabs:
table_columns:
actions:
support-tab:
panel_tabs:
support_info_tab: true
@ -780,10 +773,11 @@ tabs:
group_quotas_tab: true
user_accounting_tab: true
user_showback_tab: true
# The buttons inside the settings-tab panel user_info_tab are
# configured with users-tab/actions; User.update_password and
# User.login_token
actions:
# The buttons inside the settings-tab panel user_info_tab are
# configured with users-tab/actions; User.update_password and
# User.login_token
#
# Buttons for user_config_tab
Settings.change_language: true
Settings.change_password: true
@ -791,4 +785,7 @@ tabs:
Settings.ssh_key: true
Settings.login_token: true
# Edit button in user_quotas_tab
User.quotas_dialog: false
User.quotas_dialog: false
upgrade-top-tab:
panel_tabs:
actions: