diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 67295541d1..a3fcfd4d3d 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -26,6 +26,8 @@ enabled_tabs: enterprise-tab: true zones-tab: true autorefresh: true +features: + showback: true tabs: dashboard-tab: panel_tabs: diff --git a/src/sunstone/etc/sunstone-views/cloud.yaml b/src/sunstone/etc/sunstone-views/cloud.yaml index ebd6f3dd42..4ce192930b 100644 --- a/src/sunstone/etc/sunstone-views/cloud.yaml +++ b/src/sunstone/etc/sunstone-views/cloud.yaml @@ -1,6 +1,8 @@ provision_logo: images/one_small_logo.png enabled_tabs: provision-tab: true +features: + showback: true tabs: provision-tab: panel_tabs: diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index bd5e5edcdd..e042f7fa41 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -25,6 +25,8 @@ enabled_tabs: community-tab: false enterprise-tab: false autorefresh: true +features: + showback: true tabs: dashboard-tab: panel_tabs: diff --git a/src/sunstone/etc/sunstone-views/vcenter.yaml b/src/sunstone/etc/sunstone-views/vcenter.yaml index 87d8b2b560..f81537e796 100644 --- a/src/sunstone/etc/sunstone-views/vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter.yaml @@ -26,6 +26,8 @@ enabled_tabs: enterprise-tab: true zones-tab: true autorefresh: true +features: + showback: true tabs: dashboard-tab: panel_tabs: diff --git a/src/sunstone/etc/sunstone-views/vdcadmin.yaml b/src/sunstone/etc/sunstone-views/vdcadmin.yaml index 4cfd7713e3..aea47b87f7 100644 --- a/src/sunstone/etc/sunstone-views/vdcadmin.yaml +++ b/src/sunstone/etc/sunstone-views/vdcadmin.yaml @@ -1,6 +1,8 @@ provision_logo: images/one_small_logo.png enabled_tabs: provision-tab: true +features: + showback: true tabs: provision-tab: panel_tabs: diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js index fed96b8b45..2b9a0695b2 100644 --- a/src/sunstone/public/js/plugins/config-tab.js +++ b/src/sunstone/public/js/plugins/config-tab.js @@ -31,6 +31,7 @@ Config = { var enabled = config['view']['enabled_tabs'][tab_name]; return enabled; }, + "isTabActionEnabled": function(tab_name, action_name, panel_name){ var enabled; if (panel_name) { @@ -51,6 +52,14 @@ Config = { } }, + "isFeatureEnabled": function(feature_name){ + if (config['features'] && config['features'][feature_name]) { + return true; + } else { + return false; + } + }, + "tabTableColumns": function(tab_name){ var columns = config['view']['tabs'][tab_name]['table_columns']; diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 4712b05bd9..760fb8f0bb 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -734,17 +734,26 @@ function updateGroupInfo(request,group){ content: '
' }; - var showback_tab = { - title: tr("Showback"), - icon: "fa-money", - content: '
' - }; Sunstone.updateInfoPanelTab("group_info_panel","group_info_tab",info_tab); Sunstone.updateInfoPanelTab("group_info_panel","group_quotas_tab",quotas_tab); Sunstone.updateInfoPanelTab("group_info_panel","group_providers_tab",providers_tab); Sunstone.updateInfoPanelTab("group_info_panel","group_accounting_tab",accounting_tab); - Sunstone.updateInfoPanelTab("group_info_panel","group_showback_tab",showback_tab); + + if (Config.isFeatureEnabled("showback")) { + var showback_tab = { + title: tr("Showback"), + icon: "fa-money", + content: '
' + }; + + Sunstone.updateInfoPanelTab("group_info_panel","group_showback_tab",showback_tab); + + showbackGraphs( + $("#group_showback","#group_info_panel"), + { fixed_group: info.ID }); + } + Sunstone.popUpInfoPanel("group_info_panel", 'groups-tab'); $("#add_rp_button", $("#group_info_panel")).click(function(){ @@ -760,10 +769,6 @@ function updateGroupInfo(request,group){ { fixed_group: info.ID, init_group_by: "user" }); - showbackGraphs( - $("#group_showback","#group_info_panel"), - { fixed_group: info.ID }); - setupQuotasPanel(info, "#group_info_panel", Config.isTabActionEnabled("groups-tab", "Group.quotas_dialog"), diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index 6019023be3..810566691b 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -825,10 +825,10 @@ var provision_user_info = '