Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prevent js error when updating password

This commit is contained in:
Olivier Lamy 2014-05-30 16:28:15 +10:00
parent 24be759078
commit e1bad647dd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
View File

@ -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, 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.timestampAccountCreation,user.timestampLastLogin,user.timestampLastPasswordChange,user.locked,
user.passwordChangeRequired,null,user.readOnly,user.userManagerId); user.passwordChangeRequired,null,user.readOnly,user.userManagerId);
kUser.rememberme(user.rememberme()); kUser.rememberme(user.rememberme());
var userJson=ko.toJSON(kUser); var userJson=ko.toJSON(kUser);
$.log("reccordLoginCookie:"+userJson); $.log("reccordLoginCookie:"+userJson);

6
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
View File

@ -604,7 +604,7 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
window.modalEditUserBox = $("#modal-user-edit").modal({backdrop:'static',show:false}); window.modalEditUserBox = $("#modal-user-edit").modal({backdrop:'static',show:false});
window.modalEditUserBox.bind('hidden', function () { window.modalEditUserBox.bind('hidden', function () {
$("#modal-user-edit-err-message").hide(); $("#modal-user-edit-err-message").hide();
}) });
$("#modal-user-edit").find("#modal-user-edit-ok").on( "click keydown keypress", function(e) { $("#modal-user-edit").find("#modal-user-edit-ok").on( "click keydown keypress", function(e) {
e.preventDefault(); e.preventDefault();
$.log("user.js#editUserDetailsBox"); $.log("user.js#editUserDetailsBox");
@ -620,6 +620,10 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
password:$("#modal-user-edit").find("#userEditFormNewPassword").val(), password:$("#modal-user-edit").find("#userEditFormNewPassword").val(),
confirmPassword:$("#modal-user-edit").find("#userEditFormNewPasswordConfirm").val() confirmPassword:$("#modal-user-edit").find("#userEditFormNewPasswordConfirm").val()
}; };
var kuser =getUserFromLoginCookie();
user.rememberme=function(){
return kuser.rememberme();
}
editUserDetails(user); editUserDetails(user);
}); });
} }