diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 9f11b71da9..617374c1f8 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -747,14 +747,16 @@ function updateGroupInfo(request,group){ }; Sunstone.updateInfoPanelTab("group_info_panel","group_showback_tab",showback_tab); - + } + + Sunstone.popUpInfoPanel("group_info_panel", 'groups-tab'); + + if (Config.isFeatureEnabled("showback")) { 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(){ initUpdateGroupDialog(); diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 7a33920896..c9ddb7e0f8 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -635,13 +635,16 @@ function updateUserInfo(request,user){ }; Sunstone.updateInfoPanelTab("user_info_panel","user_showback_tab",showback_tab); - + } + + //Sunstone.updateInfoPanelTab("user_info_panel","user_acct_tab",acct_tab); + Sunstone.popUpInfoPanel("user_info_panel", 'users-tab'); + + if (Config.isFeatureEnabled("showback")) { showbackGraphs( $("#user_showback","#user_info_panel"), { fixed_user: info.ID }); } - //Sunstone.updateInfoPanelTab("user_info_panel","user_acct_tab",acct_tab); - Sunstone.popUpInfoPanel("user_info_panel", 'users-tab'); accountingGraphs( $("#user_accounting","#user_info_panel"), diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index b50f00686a..05fdf43a7b 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -4797,10 +4797,6 @@ function time_UTC(time){ // fixed_group_by "user", "group", "vm". set a fixed group-by selector function showbackGraphs(div, opt){ - if(div.html() != ""){ - return false; - } - div.html( '