diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py index 4d3b972432..4d9472dabb 100644 --- a/frappe/utils/nestedset.py +++ b/frappe/utils/nestedset.py @@ -13,7 +13,6 @@ import frappe from frappe import _ from frappe.model.document import Document -from frappe.utils import now from frappe.query_builder import DocType, Order class NestedSetRecursionError(frappe.ValidationError): pass @@ -24,25 +23,25 @@ class NestedSetInvalidMergeError(frappe.ValidationError): pass # called in the on_update method def update_nsm(doc): # get fields, data from the DocType - opf = 'old_parent' - pf = "parent_" + frappe.scrub(doc.doctype) + old_parent_field = 'old_parent' + parent_field = "parent_" + frappe.scrub(doc.doctype) if hasattr(doc,'nsm_parent_field'): - pf = doc.nsm_parent_field + parent_field = doc.nsm_parent_field if hasattr(doc,'nsm_oldparent_field'): - opf = doc.nsm_oldparent_field + old_parent_field = doc.nsm_oldparent_field - p, op = doc.get(pf) or None, doc.get(opf) or None + parent, old_parent = doc.get(parent_field) or None, doc.get(old_parent_field) or None # has parent changed (?) or parent is None (root) if not doc.lft and not doc.rgt: - update_add_node(doc, p or '', pf) - elif op != p: - update_move_node(doc, pf) + update_add_node(doc, parent or '', parent_field) + elif old_parent != parent: + update_move_node(doc, parent_field) # set old parent - doc.set(opf, p) - frappe.db.set_value(doc.doctype, doc.name, opf, p or '', update_modified=False) + doc.set(old_parent_field, parent) + frappe.db.set_value(doc.doctype, doc.name, old_parent_field, parent or '', update_modified=False) doc.reload() @@ -51,8 +50,6 @@ def update_add_node(doc, parent, parent_field): insert a new node """ - n = now() - doctype = doc.doctype name = doc.name @@ -85,7 +82,6 @@ def update_add_node(doc, parent, parent_field): def update_move_node(doc, parent_field): - n = now() parent = doc.get(parent_field) if parent: