You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/22 17:35:34 UTC
svn commit: r1449110 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
Author: olamy
Date: Fri Feb 22 16:35:34 2013
New Revision: 1449110
URL: http://svn.apache.org/r1449110
Log:
correctly go to welcome on logout
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js?rev=1449110&r1=1449109&r2=1449110&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js Fri Feb 22 16:35:34 2013
@@ -77,7 +77,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
- logout=function(doScreenChange){
+ logout=function(){
var user = getUserFromLoginCookie();
if(user){
user.logged=false;
@@ -94,14 +94,15 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
$("#user-messages" ).empty();
$("#login-welcome" ).hide();
$.ajax({
- url: 'restServices/redbackServices/loginService/logout',
- complete: function(){
- // go to welcome on logout
- //window.sammyArchivaApplication.setLocation("#welcome");
- displayWelcome();
- }
-
- });
+ url: 'restServices/redbackServices/loginService/logout'
+ } ).always(
+ function(){
+ // go to welcome on logout
+ //window.sammyArchivaApplication.setLocation("#welcome");
+ $.log("displayWelcome");
+ displayWelcome();
+ }
+ );
};
@@ -745,9 +746,9 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
displayWelcome=function(){
$.log("#welcome hash");
checkCreateAdminLink(function(){
- //window.sammyArchivaApplication.setLocation("#search")
- $("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo: window.archivaRuntimeInfo}));
- drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome");
+ window.sammyArchivaApplication.setLocation("#welcome");
+ //$("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo: window.archivaRuntimeInfo}));
+ //drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome");
});
}