diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 972b6ef759..33059d9f52 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -632,7 +632,7 @@ function updateGroupInfo(request,group){ if (Config.isFeatureEnabled("showback")) { showbackGraphs( $("#group_showback","#group_info_panel"), - { fixed_group: info.ID }); + { fixed_user: "", fixed_group: info.ID }); } $("#add_rp_button", $("#group_info_panel")).click(function(){ diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index c267c57350..df85ded29c 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -2985,7 +2985,7 @@ function show_provision_user_info_callback(request, response) { if (Config.isFeatureEnabled("showback")) { showbackGraphs( $("#provision_user_info_showback_div"), - { fixed_user: info.ID}); + { fixed_user: info.ID, fixed_group: ""}); } } @@ -3015,7 +3015,7 @@ function show_provision_group_info_callback(request, response) { if (Config.isFeatureEnabled("showback")) { showbackGraphs( $("#provision_info_vdc_group_showback", context), - { fixed_group: info.ID }); + { fixed_user: "", fixed_group: info.ID }); } $("#acct_placeholder", context).hide(); @@ -5493,7 +5493,8 @@ function setup_provision_user_info(context) { showbackGraphs( $(".provision_vdc_info_container", context), - { fixed_user: $(".provision_info_vdc_user", context).attr("opennebula_id")}); + { fixed_user: $(".provision_info_vdc_user", context).attr("opennebula_id"), + fixed_group: "" }); $(".provision_vdc_info_container", context).prepend( '

'+ diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 8b95a8085b..9b6056d144 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -633,7 +633,7 @@ function updateUserInfo(request,user){ if (Config.isFeatureEnabled("showback")) { showbackGraphs( $("#user_showback","#user_info_panel"), - { fixed_user: info.ID }); + { fixed_user: info.ID, fixed_group: "" }); } accountingGraphs( diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js index 92da8c8f30..29e3dc7f74 100644 --- a/src/sunstone/public/js/sunstone.js +++ b/src/sunstone/public/js/sunstone.js @@ -4851,31 +4851,22 @@ function time_UTC(time){ // div is a jQuery selector // The following options can be set: -// fixed_user fix an owner user ID -// fixed_group fix an owner group ID -// init_group_by "user", "group", "vm". init the group-by selector -// fixed_group_by "user", "group", "vm". set a fixed group-by selector +// fixed_user fix an owner user ID. Use "" to fix to "any user" +// fixed_group fix an owner group ID. Use "" to fix to "any group" function showbackGraphs(div, opt){ div.html( '
\ -
\ - \ -
\ -
\ - \ -
\ -
\ -
\ -
\ -
\ +
\ + \ +
\
\ -
\ - \ +
\ + \ +
\ +
\ +
\ + \
\
\
\ @@ -4952,29 +4943,17 @@ function showbackGraphs(div, opt){ // VM owner: all, group, user //-------------------------------------------------------------------------- - if (opt.fixed_user != undefined || opt.fixed_group != undefined){ - $("#showback_owner_container", div).hide(); + if (opt.fixed_user != undefined){ + $("#showback_user_container", div).hide(); } else { - $("select#showback_owner", div).change(function(){ - var value = $(this).val(); - - switch (value){ - case "showback_owner_all": - $("#showback_owner_select", div).hide(); - break; - - case "showback_owner_group": - $("#showback_owner_select", div).show(); - insertSelectOptions("#showback_owner_select", div, "Group"); - break; - - case "showback_owner_user": - $("#showback_owner_select", div).show(); - insertSelectOptions("#showback_owner_select", div, "User", -1, false, + insertSelectOptions("#showback_user_select", div, "User", -1, false, ''); - break; - } - }); + } + + if (opt.fixed_group != undefined){ + $("#showback_group_container", div).hide(); + } else { + insertSelectOptions("#showback_group_select", div, "Group", "", true); } showback_dataTable = $("#showback_datatable",div).dataTable({ @@ -5013,29 +4992,29 @@ function showbackGraphs(div, opt){ $("#showback_submit", div).on("click", function(){ var options = {}; + + var userfilter; + var group; + if (opt.fixed_user != undefined){ - options.userfilter = opt.fixed_user; - } else if (opt.fixed_group != undefined){ - options.group = opt.fixed_group; + userfilter = opt.fixed_user; + } else { - var select_val = $("#showback_owner_select .resource_list_select", div).val(); + userfilter = $("#showback_user_select .resource_list_select", div).val(); + } - switch ($("select#showback_owner", div).val()){ - case "showback_owner_all": - break; + if (opt.fixed_group != undefined){ + group = opt.fixed_group; + } else { + group = $("#showback_group_select .resource_list_select", div).val(); + } - case "showback_owner_group": - if(select_val != ""){ - options.group = select_val; - } - break; + if(userfilter != ""){ + options.userfilter = userfilter; + } - case "showback_owner_user": - if(select_val != ""){ - options.userfilter = select_val; - } - break; - } + if(group != ""){ + options.group = group; } OpenNebula.VM.showback({