1
0
forked from test/crm

fix: removed user override and use document method hook instead

This commit is contained in:
Shariq Ansari 2025-03-01 14:04:46 +05:30
parent 458347b0a5
commit bd52005dd2
3 changed files with 4 additions and 19 deletions

View File

@ -15,12 +15,10 @@ def login():
frappe.local.response["location"] = frappe.local.response["redirect_to"]
def validate_reset_password(user):
def validate_reset_password(doc, event):
if frappe.conf.demo_username and frappe.session.user == frappe.conf.demo_username:
frappe.throw(
_("Password cannot be reset by Demo User {}").format(
frappe.bold(frappe.conf.demo_username)
),
_("Password cannot be reset by Demo User {}").format(frappe.bold(frappe.conf.demo_username)),
frappe.PermissionError,
)
@ -28,9 +26,6 @@ def validate_reset_password(user):
def validate_user(doc, event):
if frappe.conf.demo_username and frappe.session.user == frappe.conf.demo_username and doc.new_password:
frappe.throw(
_("Password cannot be reset by Demo User {}").format(
frappe.bold(frappe.conf.demo_username)
),
_("Password cannot be reset by Demo User {}").format(frappe.bold(frappe.conf.demo_username)),
frappe.PermissionError,
)

View File

@ -132,7 +132,6 @@ before_uninstall = "crm.uninstall.before_uninstall"
override_doctype_class = {
"Contact": "crm.overrides.contact.CustomContact",
"Email Template": "crm.overrides.email_template.CustomEmailTemplate",
"User": "crm.overrides.user.CustomUser",
}
# Document Events
@ -161,6 +160,7 @@ doc_events = {
},
"User": {
"before_validate": ["crm.api.demo.validate_user"],
"validate_reset_password": ["crm.api.demo.validate_reset_password"],
},
}

View File

@ -1,10 +0,0 @@
# import frappe
from frappe import _
from frappe.core.doctype.user.user import User
from crm.api.demo import validate_reset_password
class CustomUser(User):
def validate_reset_password(self):
# restrict demo user to reset password
validate_reset_password(self)