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

Improvements for add resource provider dialog

Browse Source
This commit is contained in:
Tino Vazquez 2014-03-10 11:42:06 +01:00
parent 1af40ed49c
commit b6542a628c
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/onezone
View File

@ -135,11 +135,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
helper.show_resource(args[0],options)
end
setzone_desc = <<-EOT.unindent
set_desc = <<-EOT.unindent
Set shell session access point for the CLI to the given Zone
EOT
command :setzone, setzone_desc,:zoneid do
command :set, set_desc,:zoneid do
helper.set_zone(args[0])
end
end

6
src/sunstone/models/OpenNebulaJSON/GroupJSON.rb
View File

@ -55,7 +55,7 @@ module OpenNebulaJSON
end
def update_json(params=Hash.new)
super(params['template_raw'])
update(params['template_raw'])
end
def set_quota(params=Hash.new)
@ -65,11 +65,11 @@ module OpenNebulaJSON
end
def add_provider_json(params=Hash.new)
super(params['zone_id'].to_i, params['cluster_id'].to_i)
add_provider(params['zone_id'].to_i, params['cluster_id'].to_i)
end
def del_provider_json(params=Hash.new)
super(params['zone_id'].to_i, params['cluster_id'].to_i)
del_provider(params['zone_id'].to_i, params['cluster_id'].to_i)
end
end
end

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

@ -40,7 +40,7 @@ var group_acct_graphs = [
var create_group_tmpl =
'<div class="row">\
<h3 id="create_vnet_header">'+tr("Create Group")+'</h3>\
<h3 id="create_group_header">'+tr("Create Group")+'</h3>\
</div>\
<div class="reveal-body">\
<form id="create_group_form" action="">\
@ -178,7 +178,7 @@ var create_group_tmpl =
</div>';
var group_quotas_tmpl = '<div class="row" class="subheader">\
<h3 id="create_vnet_header">'+tr("Update Quota")+'</h3>\
<h3 id="create_group_quotas_header">'+tr("Update Quota")+'</h3>\
</div>\
<div class="reveal-body">\
<form id="group_quotas_form" action="">'+
@ -715,7 +715,7 @@ function setup_add_rp_dialog(group){
dialog.html(
'<div class="row">\
<h3 id="create_vnet_header" class="subheader">'+tr("Select Resource Providers")+'</h3>\
<h3 id="create_rp_header" class="subheader">'+tr("Select Resource Providers")+'</h3>\
</div>\
<div class="reveal-body">\
<div class="row">\
@ -1027,16 +1027,20 @@ function update_datatable_group_clusters(datatable, zone_id, group) {
$.each(providers_array, function(index, provider){
if (provider.ZONE_ID==zone_id)
{
for(var j=0;j<rows.length;j++)
{
var current_row = $(rows[j]);
var row_cluster_id = $(rows[j]).find("td:eq(1)").html();
if (provider.CLUSTER_ID == row_cluster_id)
if (provider.CLUSTER_ID == row_cluster_id || provider.CLUSTER_ID == "10")
{
current_row.click();
}
}
if (provider.CLUSTER_ID == "10")
$('#zone'+zone_id+'_add_rpresources_all').click();
}
});
}
}