From e44ee0ae7f915114eeed74ee4fd309b923354a57 Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Fri, 15 Dec 2017 12:15:58 +0530 Subject: [PATCH] disabled user not allowed to reset password (#4630) --- frappe/core/doctype/user/user.py | 2 ++ frappe/templates/includes/login/login.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 7a224719f8..833beb5cc9 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -769,6 +769,8 @@ def reset_password(user): try: user = frappe.get_doc("User", user) + if not user.enabled: + return 'disabled' user.validate_reset_password() user.reset_password(send_email=True) diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js index f9a5bc44b8..d02d449c38 100644 --- a/frappe/templates/includes/login/login.js +++ b/frappe/templates/includes/login/login.js @@ -184,6 +184,8 @@ login.login_handlers = (function() { login.set_indicator("{{ _("Not a valid user") }}", 'red'); } else if (data.message=='not allowed') { login.set_indicator("{{ _("Not Allowed") }}", 'red'); + } else if (data.message=='disabled') { + login.set_indicator("{{ _("Not Allowed: Disabled User") }}", 'red'); } else { login.set_indicator("{{ _("Instructions Emailed") }}", 'green'); }