From bf2111eeae8d0ccd43c471ab16aef32803f55d3d Mon Sep 17 00:00:00 2001 From: wklken Date: Wed, 13 Apr 2022 15:26:37 +0800 Subject: [PATCH 1/2] fix(login): login page show message from bk-user --- paas2/login/backends/bk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paas2/login/backends/bk.py b/paas2/login/backends/bk.py index dd1b6e5d3..14a016790 100644 --- a/paas2/login/backends/bk.py +++ b/paas2/login/backends/bk.py @@ -70,7 +70,7 @@ def authenticate(self, username=None, password=None, language="", **kwargs): # PASSWORD_EXPIRED = 3210018 if code in [3210021, 3210018]: raise PasswordNeedReset(message=message, reset_password_url=userinfo.get("reset_password_url")) - message = _("调用用户管理接口失败,请联系管理员, 查看登录日志获取错误详情") + # message = _("调用用户管理接口失败,请联系管理员, 查看登录日志获取错误详情") raise AuthenticationError(message=message, redirect_to=userinfo.get("redirect_to")) # here we got the userinfo, but the language is not update yet(async in signal) From ac581e850eca575347beca6fe29ad0fe9b884a6a Mon Sep 17 00:00:00 2001 From: wklken Date: Wed, 13 Apr 2022 15:27:12 +0800 Subject: [PATCH 2/2] chore(version): 2.14.6 --- paas2/VERSION | 2 +- paas2/release.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/paas2/VERSION b/paas2/VERSION index fbdb3b99a..d7b0d017e 100644 --- a/paas2/VERSION +++ b/paas2/VERSION @@ -1 +1 @@ -2.14.5 +2.14.6 diff --git a/paas2/release.md b/paas2/release.md index a85cdc317..293d56c15 100644 --- a/paas2/release.md +++ b/paas2/release.md @@ -1,5 +1,8 @@ Release Log =============================== +# 2.14.6 + - bugfix: login show error message from bk-user + # 2.14.5 - bugfix: login password wrong 500 - update: login reset password if it's an initial password or password expired