From: Olivier Lamy <olamy@apache.org>
Date: Fri, 21 Dec 2012 16:25:58 +0000 (+0000)
Subject: fix isLogged call
X-Git-Tag: archiva-1.4-M4~425
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4d71b675e74a5a739b48f9254ec9b0860a497788;p=archiva.git

fix isLogged call

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
index 899deb4c1..4faafeefb 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
@@ -43,12 +43,16 @@ define("redback",["jquery","utils","jquery.validate","jquery.json","knockout",
     $.ajax("restServices/redbackServices/loginService/isLogged", {
       type: "GET",
       success: function(data) {
-        userLogged = data;
-        $.log("userLogged:"+userLogged);
+        var user = data ? mapUser(data):null;
+        window.user=user;
+        if(user){
+          reccordLoginCookie(user);
+        }
+        $.log("userLogged:"+(user!=null));
         if (successFn){
-          successFn(userLogged ? getUserFromLoginCookie():null);
+          successFn(user ? user:null);
         }
-        if(!userLogged){
+        if(!user){
           if(notLoggedFn){
             notLoggedFn();
           }