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/30 08:28:30 UTC
git commit: prevent js error when updating password
Repository: archiva
Updated Branches:
refs/heads/master 24be75907 -> e1bad647d
prevent js error when updating password
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/e1bad647
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/e1bad647
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/e1bad647
Branch: refs/heads/master
Commit: e1bad647dd9746c1fd82707ffba0e8c577edbc10
Parents: 24be759
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri May 30 16:28:15 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri May 30 16:28:15 2014 +1000
----------------------------------------------------------------------
.../archiva-webapp/src/main/webapp/js/archiva/main.js | 1 +
.../archiva-webapp/src/main/webapp/js/redback/user.js | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/e1bad647/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 3fe2545..87d8272 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
@@ -38,6 +38,7 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
var kUser = new User(user.username, user.password, 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:"+userJson);
http://git-wip-us.apache.org/repos/asf/archiva/blob/e1bad647/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
index 039129c..da16bf5 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
@@ -604,7 +604,7 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
window.modalEditUserBox = $("#modal-user-edit").modal({backdrop:'static',show:false});
window.modalEditUserBox.bind('hidden', function () {
$("#modal-user-edit-err-message").hide();
- })
+ });
$("#modal-user-edit").find("#modal-user-edit-ok").on( "click keydown keypress", function(e) {
e.preventDefault();
$.log("user.js#editUserDetailsBox");
@@ -620,6 +620,10 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
password:$("#modal-user-edit").find("#userEditFormNewPassword").val(),
confirmPassword:$("#modal-user-edit").find("#userEditFormNewPasswordConfirm").val()
};
+ var kuser =getUserFromLoginCookie();
+ user.rememberme=function(){
+ return kuser.rememberme();
+ }
editUserDetails(user);
});
}