mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-14 15:11:52 +00:00
fix: show user disable audit log
(cherry picked from commit 73d1852773)
This commit is contained in:
@@ -64,15 +64,8 @@ class Employee(NestedSet):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def validate_user_details(self):
|
def validate_user_details(self):
|
||||||
if self.user_id:
|
self.validate_for_enabled_user_id()
|
||||||
data = frappe.db.get_value("User", self.user_id, ["enabled"], as_dict=1)
|
self.validate_duplicate_user_id()
|
||||||
|
|
||||||
if not data:
|
|
||||||
self.user_id = None
|
|
||||||
return
|
|
||||||
|
|
||||||
self.validate_for_enabled_user_id(data.get("enabled", 0))
|
|
||||||
self.validate_duplicate_user_id()
|
|
||||||
|
|
||||||
def update_nsm_model(self):
|
def update_nsm_model(self):
|
||||||
frappe.utils.nestedset.update_nsm(self)
|
frappe.utils.nestedset.update_nsm(self)
|
||||||
@@ -184,12 +177,15 @@ class Employee(NestedSet):
|
|||||||
if not self.relieving_date:
|
if not self.relieving_date:
|
||||||
throw(_("Please enter relieving date."))
|
throw(_("Please enter relieving date."))
|
||||||
|
|
||||||
def validate_for_enabled_user_id(self, enabled):
|
def validate_for_enabled_user_id(self):
|
||||||
if enabled is None:
|
if not frappe.db.exists("User", self.user_id):
|
||||||
frappe.throw(_("User {0} does not exist").format(self.user_id))
|
frappe.throw(_("User {0} does not exist").format(self.user_id))
|
||||||
|
|
||||||
|
user = frappe.get_doc("User", self.user_id)
|
||||||
|
enabled = user.enabled
|
||||||
if self.status != "Active" and enabled or self.status == "Active" and enabled == 0:
|
if self.status != "Active" and enabled or self.status == "Active" and enabled == 0:
|
||||||
frappe.db.set_value("User", self.user_id, "enabled", not enabled)
|
user.enabled = not enabled
|
||||||
|
user.save(ignore_permissions=True)
|
||||||
|
|
||||||
def validate_duplicate_user_id(self):
|
def validate_duplicate_user_id(self):
|
||||||
Employee = frappe.qb.DocType("Employee")
|
Employee = frappe.qb.DocType("Employee")
|
||||||
|
|||||||
Reference in New Issue
Block a user