Author: olamy
Date: Fri Dec 21 16:25:58 2012
New Revision: 1425002
URL: http://svn.apache.org/viewvc?rev=1425002&view=rev
Log:
fix isLogged call
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js?rev=1425002&r1=1425001&r2=1425002&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
Fri Dec 21 16:25:58 2012
@@ -43,12 +43,16 @@ define("redback",["jquery","utils","jque
$.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();
}