RANGER-2282: The error message for changing password is incorrect in User Profile page.
Signed-off-by: peng.jianhua <peng.jian...@zte.com.cn> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/9dbd4c97 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/9dbd4c97 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/9dbd4c97 Branch: refs/heads/ranger-1 Commit: 9dbd4c97f975d4990763ece30550519cf2d28c5e Parents: 6596dcd Author: zhangqiang2 <zhangqia...@zte.com.cn> Authored: Tue Nov 13 10:48:04 2018 +0800 Committer: Mehul Parikh <me...@apache.org> Committed: Thu Dec 13 17:44:40 2018 +0530 ---------------------------------------------------------------------- security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java | 4 ++-- security-admin/src/main/webapp/scripts/views/user/UserProfile.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/9dbd4c97/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java index 2a638f8..9e45782 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java @@ -418,7 +418,7 @@ public class UserMgr { String encryptedOldPwd = encrypt(pwdChange.getLoginId(),pwdChange.getOldPassword()); if (!stringUtil.equals(encryptedOldPwd, gjUser.getPassword())) { logger.info("changePassword(). Invalid old password. LoginId="+ pwdChange.getLoginId()); - throw restErrorUtil.createRESTException("serverMsg.userMgrOldPassword",MessageEnums.INVALID_INPUT_DATA, null, null,pwdChange.getLoginId()); + throw restErrorUtil.createRESTException("validationMessages.oldPasswordError",MessageEnums.INVALID_INPUT_DATA, null, null,pwdChange.getLoginId()); } //validate new password @@ -448,7 +448,7 @@ public class UserMgr { } else { ret.setMsgDesc("Password update failed"); ret.setStatusCode(VXResponse.STATUS_ERROR); - throw restErrorUtil.createRESTException("serverMsg.userMgrNewPassword",MessageEnums.INVALID_INPUT_DATA, gjUser.getId(),"password", gjUser.toString()); + throw restErrorUtil.createRESTException("serverMsg.userMgrOldPassword",MessageEnums.INVALID_INPUT_DATA, gjUser.getId(),"password", gjUser.toString()); } return ret; } http://git-wip-us.apache.org/repos/asf/ranger/blob/9dbd4c97/security-admin/src/main/webapp/scripts/views/user/UserProfile.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/user/UserProfile.js b/security-admin/src/main/webapp/scripts/views/user/UserProfile.js index 8e60b53..408b311 100644 --- a/security-admin/src/main/webapp/scripts/views/user/UserProfile.js +++ b/security-admin/src/main/webapp/scripts/views/user/UserProfile.js @@ -171,7 +171,7 @@ define(function(require){ that.form.fields.newPassword.setError(localization.tt('validationMessages.newPasswordError')); that.form.fields.reEnterPassword.setError(localization.tt('validationMessages.newPasswordError')); }else if((msResponse.responseJSON.msgDesc) == "serverMsg.userMgrOldPassword"){ - that.form.fields.oldPassword.setError(localization.tt('validationMessages.oldPasswordRepeatError')); + that.form.fields.newPassword.setError(localization.tt('validationMessages.oldPasswordRepeatError')); }else if(msResponse.status == 419){ XAUtil.defaultErrorHandler(options , msResponse); } else {
