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 #1078: Fix login redirection problems in SelfService

Browse Source
This commit is contained in:
Hector Sanjuan 2012-01-23 10:10:44 +01:00 committed by Ruben S. Montero
parent 6d4f4903da
commit f2e8103d35
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cloud/occi/lib/occi-server.rb
View File

@ -324,7 +324,7 @@ post '/config' do
end
get '/ui/login' do
File.read(File.dirname(__FILE__)+'/ui/templates/login.html')
redirect to('ui')
end
post '/ui/login' do

9
src/sunstone/public/js/sunstone-util.js
View File

@ -326,7 +326,14 @@ function onError(request,error_json) {
//redirect to login if unauthenticated
if (error_json.error.http_status=="401") {
window.location.href = "login";
switch (whichUI()){
case "selfservice":
window.location.href = "ui";
break;
default:
window.location.href = "login";
};
onError.disabled=false;
return false;
};

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

@ -403,7 +403,7 @@ function setLogin(){
case "ozones":
username = cookie["ozones-user"];
break;
case "occi":
case "selfservice":
username = cookie["occi-user"];
break;
};
@ -420,7 +420,7 @@ function setLogin(){
case "ozones":
oZones.Auth.logout({success:redirect});
break;
case "occi":
case "selfservice":
OCCI.Auth.logout({success:function(){window.location.href = "ui";}});
break;
}
@ -436,7 +436,7 @@ function whichUI(){
if (typeof(oZones)!="undefined")
return "ozones";
if (typeof(OCCI)!="undefined")
return "occi";
return "selfservice";
};
//Inserts all main tabs in the DOM