From 0125e469d8405b48ad2b886a9f36263ca2bb2ae7 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 22 Apr 2013 11:25:34 +0200 Subject: [PATCH] bug #1936: Fix broken views in ruby 1.8.7 --- src/sunstone/etc/sunstone-views/admin.yaml | 33 +++++++++++----------- src/sunstone/etc/sunstone-views/user.yaml | 33 +++++++++++----------- src/sunstone/views/index.erb | 4 +-- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 676f81be64..56aadb2c8e 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -1,7 +1,23 @@ small_logo: images/opennebula-sunstone-v4.0-small.png +enabled_tabs: + - dashboard-tab + - system-tab + - users-tab + - groups-tab + - acls-tab + - vresources-tab + - vms-tab + - templates-tab + - images-tab + - files-tab + - infra-tab + - clusters-tab + - hosts-tab + - datastores-tab + - vnets-tab + - marketplace-tab tabs: dashboard-tab: - enabled: true panel_tabs: actions: widgets_three_per_row: @@ -13,11 +29,9 @@ tabs: - vms widgets_one_per_row: system-tab: - enabled: true panel_tabs: actions: users-tab: - enabled: true panel_tabs: user_info_panel: true user_quotas_tab: true @@ -40,7 +54,6 @@ tabs: User.chauth: true User.delete: true groups-tab: - enabled: true panel_tabs: group_quotas_tab: true table_columns: @@ -57,7 +70,6 @@ tabs: Group.quotas_dialog: true Group.delete: true acls-tab: - enabled: true panel_tabs: table_columns: - 0 # Checkbox @@ -72,11 +84,9 @@ tabs: Acl.create_dialog: true Acl.delete: true vresources-tab: - enabled: true panel_tabs: actions: vms-tab: - enabled: true panel_tabs: vm_info_tab: true vm_capacity_tab: true @@ -137,7 +147,6 @@ tabs: VM.resched: true VM.unresched: true templates-tab: - enabled: true panel_tabs: template_info_tab: true template_template_tab: true @@ -168,7 +177,6 @@ tabs: context: true scheduling: true images-tab: - enabled: true panel_tabs: image_info_panel: true table_columns: @@ -198,7 +206,6 @@ tabs: Image.clone_dialog: true Image.delete: true files-tab: - enabled: true panel_tabs: file_info_panel: true table_columns: @@ -225,11 +232,9 @@ tabs: File.disable: true File.delete: true infra-tab: - enabled: true panel_tabs: actions: clusters-tab: - enabled: true panel_tabs: cluster_info_tab: true cluster_host_tab: true @@ -248,7 +253,6 @@ tabs: Cluster.update_dialog: true Cluster.delete: true hosts-tab: - enabled: true panel_tabs: host_info_tab: true host_monitoring_tab: true @@ -274,7 +278,6 @@ tabs: Host.disable: true Host.delete: true datastores-tab: - enabled: true panel_tabs: datastore_info_tab: true datastore_image_tab: true @@ -298,7 +301,6 @@ tabs: Datastore.chmod: true Datastore.delete: true vnets-tab: - enabled: true panel_tabs: vnet_info_tab: true vnet_leases_tab: true @@ -325,7 +327,6 @@ tabs: Network.remove_lease: true Network.release_lease: true marketplace-tab: - enabled: true panel_tabs: marketplace_info_tab: true table_columns: diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index c34f085be9..d194ce7a2d 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -1,7 +1,23 @@ small_logo: images/opennebula-sunstone-v4.0-small.png +enabled_tabs: + - dashboard-tab + #- system-tab + #- users-tab + #- groups-tab + #- acls-tab + - vresources-tab + - vms-tab + - templates-tab + - images-tab + - files-tab + - infra-tab + #- clusters-tab + #- hosts-tab + - datastores-tab + - vnets-tab + - marketplace-tab tabs: dashboard-tab: - enabled: true panel_tabs: actions: widgets_three_per_row: @@ -14,11 +30,9 @@ tabs: widgets_one_per_row: - vms system-tab: - enabled: false panel_tabs: actions: users-tab: - enabled: false panel_tabs: user_info_panel: true user_quotas_tab: true @@ -41,7 +55,6 @@ tabs: User.chauth: true User.delete: true groups-tab: - enabled: false panel_tabs: group_quotas_tab: true table_columns: @@ -58,7 +71,6 @@ tabs: Group.quotas_dialog: true Group.delete: true acls-tab: - enabled: false panel_tabs: table_columns: - 0 # Checkbox @@ -73,11 +85,9 @@ tabs: Acl.create_dialog: true Acl.delete: true vresources-tab: - enabled: true panel_tabs: actions: vms-tab: - enabled: true panel_tabs: vm_info_tab: true vm_capacity_tab: true @@ -138,7 +148,6 @@ tabs: VM.resched: false VM.unresched: false templates-tab: - enabled: true panel_tabs: template_info_tab: true template_template_tab: true @@ -169,7 +178,6 @@ tabs: context: true scheduling: false images-tab: - enabled: true panel_tabs: image_info_panel: true table_columns: @@ -199,7 +207,6 @@ tabs: Image.clone_dialog: true Image.delete: true files-tab: - enabled: true panel_tabs: file_info_panel: true table_columns: @@ -226,11 +233,9 @@ tabs: File.disable: true File.delete: true infra-tab: - enabled: true panel_tabs: actions: clusters-tab: - enabled: false panel_tabs: cluster_info_tab: true cluster_host_tab: true @@ -249,7 +254,6 @@ tabs: Cluster.update_dialog: true Cluster.delete: true hosts-tab: - enabled: false panel_tabs: host_info_tab: true host_monitoring_tab: true @@ -275,7 +279,6 @@ tabs: Host.disable: true Host.delete: true datastores-tab: - enabled: true panel_tabs: datastore_info_tab: false datastore_image_tab: true @@ -299,7 +302,6 @@ tabs: Datastore.chmod: true Datastore.delete: false vnets-tab: - enabled: true panel_tabs: vnet_info_tab: false vnet_leases_tab: true @@ -326,7 +328,6 @@ tabs: Network.remove_lease: false Network.release_lease: false marketplace-tab: - enabled: true panel_tabs: marketplace_info_tab: true table_columns: diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index 1c027f2f14..fd8be1c41d 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -65,10 +65,8 @@ - <%- view['tabs'].each do |tab_name, tab_config| -%> - <%- if tab_config['enabled'] -%> + <%- view['enabled_tabs'].each do |tab_name| -%> - <%- end -%> <%- end -%>