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

Merge branch 'master' of git.opennebula.org:faf-71

Browse Source
This commit is contained in:
Carlos Martín 2014-01-23 12:18:46 +01:00
commit ee052ed0d6
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,7 +452,7 @@ $(document).ready(function(){
$('a.zone-choice').live("click", function(){
$.ajax({
url: 'config',
type: "POST",
type: "HEAD",
headers: {
"ZONE_ENDPOINT": this.id,
"ZONE_NAME" : this.className.split(" ")[1]

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

@ -224,26 +224,25 @@ before do
unless request.path=='/login' || request.path=='/' || request.path=='/vnc'
halt 401 unless authorized?
# Extra check: Retrieve list
if env['HTTP_ZONE_ENDPOINT']
session[:active_zone_endpoint] = env['HTTP_ZONE_ENDPOINT']
end
if env['HTTP_ZONE_ENDPOINT'] and env['HTTP_ZONE_ENDPOINT'].to_i == -1
if env['HTTP_ZONE_ENDPOINT'] && env['HTTP_ZONE_ENDPOINT'].to_i == -1
session.delete(:active_zone_endpoint)
end
if env['HTTP_ZONE_NAME']
session[:zone_name] = env['HTTP_ZONE_NAME']
end
client=$cloud_auth.client(session[:user],
session[:active_zone_endpoint])
end
@SunstoneServer = SunstoneServer.new(
client,
$conf,
logger)
client=$cloud_auth.client(session[:user],
session[:active_zone_endpoint])
@SunstoneServer = SunstoneServer.new(client,$conf,logger)
end
after do