shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-24 21:34:01 +03:00
Code Releases Wiki Activity

Fix for non admin user log into Sunstone

Browse Source
This commit is contained in:
Tino Vazquez 2014-02-13 13:04:13 +01:00
parent c557515575
commit 3b436da4d8
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -920,12 +920,15 @@ function setup_add_rp_dialog(group){
add_it = true; add_it = true;
$.each(providers_array, function(index, provider){ if(providers_array)
if (provider.ZONE_ID==zone_id && provider.CLUSTER_ID == key) {
{ $.each(providers_array, function(index, provider){
add_it = false; if (provider.ZONE_ID==zone_id && provider.CLUSTER_ID == key)
} {
}); add_it = false;
}
});
}
if (add_it) if (add_it)
{ {

3
src/sunstone/sunstone-server.rb
View File

@ -212,7 +212,8 @@ helpers do
env['rack.session.options'][:expire_after] = 30*60*60*24-1 env['rack.session.options'][:expire_after] = 30*60*60*24-1
end end
rc = OpenNebula::System.new(client).get_configuration serveradmin_client = $cloud_auth.client()
rc = OpenNebula::System.new(serveradmin_client).get_configuration
return [500, rc.message] if OpenNebula.is_error?(rc) return [500, rc.message] if OpenNebula.is_error?(rc)
return [500, "Couldn't find out zone identifier"] if !rc['FEDERATION/ZONE_ID'] return [500, "Couldn't find out zone identifier"] if !rc['FEDERATION/ZONE_ID']