correctly go to welcome on logout

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1449110 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
index fc80c154509b226497f59ec916daf97cd44dc00a..2b0e4489a8946a5a262ed31d8f94e35fad4bd60b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
@@ -77,7 +77,7 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
 
 
 
-  logout=function(doScreenChange){
+  logout=function(){
     var user = getUserFromLoginCookie();
     if(user){
       user.logged=false;
@@ -94,14 +94,15 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
     $("#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,jqueryCookie,bootstrap,archivaSearch,jqueryVa
   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");
     });
   }