shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

Bug #3629: Group selector is now visible

Browse Source
This commit is contained in:
Carlos Martín 2015-02-23 16:31:08 +01:00
parent 406f597508
commit 0c4f02ca75
4 changed files with 44 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/public/js/plugins/groups-tab.js
View File

@ -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(){

7
src/sunstone/public/js/plugins/provision-tab.js
View File

@ -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(
'<h2 class="subheader">'+

2
src/sunstone/public/js/plugins/users-tab.js
View File

@ -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(

97
src/sunstone/public/js/sunstone.js
View File

@ -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(
'<div class="row">\
<div id="showback_owner_container" class="left columns">\
<label for="showback_owner">' + tr("Filter") + '</label>\
<div class="row">\
<div class="large-5 columns">\
<select id="showback_owner" name="showback_owner">\
<option value="showback_owner_all">' + tr("All") + '</option>\
<option value="showback_owner_group">' + tr("Group") + '</option>\
<option value="showback_owner_user">' + tr("User") + '</option>\
</select>\
</div>\
<div class="large-7 columns">\
<div id="showback_owner_select"/>\
</div>\
</div>\
<div id="showback_user_container" class="left medium-4 columns">\
<label for="showback_user_select">' + tr("Filter by user") + '</label>\
<div id="showback_user_select"/>\
</div>\
<div id="showback_button_container" class="left columns">\
<button class="button radius success right" id="showback_submit" type="button">'+tr("Get Showback")+'</button>\
<div id="showback_group_container" class="left medium-4 columns">\
<label for="showback_group_select">' + tr("Filter by group") + '</label>\
<div id="showback_group_select"/>\
</div>\
<div id="showback_button_container" class="right medium-3 columns">\
<button class="button radius success right large-12" id="showback_submit" type="button">'+tr("Get Showback")+'</button>\
</div>\
</div>\
<div id="showback_placeholder">\
@ -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,
'<option value="-1">'+tr("<< me >>")+'</option>');
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({