You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2018/12/19 11:51:17 UTC
[ranger] 27/39: RANGER-2282: The error message for changing
password is incorrect in User Profile page.
This is an automated email from the ASF dual-hosted git repository.
mehul pushed a commit to branch ranger-1.1
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 1b08671e87acfd37ae40daef47a53c96c91e318a
Author: zhangqiang2 <zh...@zte.com.cn>
AuthorDate: Tue Nov 13 10:48:04 2018 +0800
RANGER-2282: The error message for changing password is incorrect in User Profile page.
Signed-off-by: peng.jianhua <pe...@zte.com.cn>
---
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(-)
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;
}
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 {