Sfoglia il codice sorgente

refactor(minor): better variable names

version-14
Ankush Menat 3 anni fa
parent
commit
6a50442936
1 ha cambiato i file con 10 aggiunte e 14 eliminazioni
  1. +10
    -14
      frappe/utils/nestedset.py

+ 10
- 14
frappe/utils/nestedset.py Vedi File

@@ -13,7 +13,6 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import now
from frappe.query_builder import DocType, Order from frappe.query_builder import DocType, Order


class NestedSetRecursionError(frappe.ValidationError): pass class NestedSetRecursionError(frappe.ValidationError): pass
@@ -24,25 +23,25 @@ class NestedSetInvalidMergeError(frappe.ValidationError): pass
# called in the on_update method # called in the on_update method
def update_nsm(doc): def update_nsm(doc):
# get fields, data from the DocType # 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'): if hasattr(doc,'nsm_parent_field'):
pf = doc.nsm_parent_field
parent_field = doc.nsm_parent_field
if hasattr(doc,'nsm_oldparent_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) # has parent changed (?) or parent is None (root)
if not doc.lft and not doc.rgt: 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 # 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() doc.reload()


@@ -51,8 +50,6 @@ def update_add_node(doc, parent, parent_field):
insert a new node insert a new node
""" """


n = now()

doctype = doc.doctype doctype = doc.doctype
name = doc.name name = doc.name


@@ -85,7 +82,6 @@ def update_add_node(doc, parent, parent_field):




def update_move_node(doc, parent_field): def update_move_node(doc, parent_field):
n = now()
parent = doc.get(parent_field) parent = doc.get(parent_field)


if parent: if parent:


Caricamento…
Annulla
Salva