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 2014/05/21 08:07:14 UTC
git commit: [MRM-1841] "Remember me" not working password not stored
anymore
Repository: archiva
Updated Branches:
refs/heads/master 54fbc5f0b -> ef572f80d
[MRM-1841] "Remember me" not working
password not stored anymore
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/ef572f80
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ef572f80
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ef572f80
Branch: refs/heads/master
Commit: ef572f80d72aaf51598ee676e6f862681f58e350
Parents: 54fbc5f
Author: Olivier Lamy <ol...@apache.org>
Authored: Wed May 21 16:06:21 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed May 21 16:06:21 2014 +1000
----------------------------------------------------------------------
.../archiva-webapp/src/main/webapp/js/archiva/main.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/ef572f80/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
----------------------------------------------------------------------
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 6472b68..00c2189 100644
--- 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
@@ -35,7 +35,11 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
var expires= Number(window.cookieInformation.timeout);
- var userJson=ko.toJSON(user);
+ var kUser = new User(user.username, null, user.confirmPassword,user.fullName,user.email,user.permanent,user.validated,
+ user.timestampAccountCreation,user.timestampLastLogin,user.timestampLastPasswordChange,user.locked,
+ user.passwordChangeRequired,null,user.readOnly,user.userManagerId);
+ kUser.rememberme(user.rememberme());
+ var userJson=ko.toJSON(kUser);
$.log("reccordLoginCookie:expires:"+expires+",path:"+path+",domain:"+domain+",secure:"+secure+",user:"+userJson);
@@ -55,7 +59,7 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
}
}
- $.cookie('archiva_login', userJson,options);
+ $.cookie('archiva_login',userJson,options);
};
getUserFromLoginCookie=function(){
@@ -65,9 +69,9 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
if(!user){
return null;
}
- var kUser = new User(user.username, user.password, user.confirmPassword,user.fullName,user.email,user.permanent,user.validated,
+ var kUser = new User(user.username, null, user.confirmPassword,user.fullName,user.email,user.permanent,user.validated,
user.timestampAccountCreation,user.timestampLastLogin,user.timestampLastPasswordChange,user.locked,
- user.passwordChangeRequired,null,user.readOnly,user.userManagerId)
+ user.passwordChangeRequired,null,user.readOnly,user.userManagerId);
$.log("user.rememberme:"+user.rememberme);