vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Treeview DB lookup should perform the same preperation operation… (backport #26199) (#26258)

Browse source 
* fix: Treeview DB lookup should perform the same preperation operations as method update_nsm in file nestedset.py (#26199)

(cherry picked from commit 7d25aedaafde97c5b911cd8ea727d7afdf1e844e)

# Conflicts:
#	frappe/desk/treeview.py

* chore: conflicts

---------

Co-authored-by: Fritz <fixundfertig123@web.de>
Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
mergify[bot] 2024-04-30 14:20:46 +00:00 • committed by GitHub
parent 9567efe20b
commit 6301b208e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/desk/treeview.py
View file

@ -43,7 +43,7 @@ def get_children(doctype, parent="", include_disabled=False, **filters):
def _get_children(doctype, parent="", ignore_permissions=False, include_disabled=False):
parent_field = "parent_" + doctype.lower().replace(" ", "_")
parent_field = "parent_" + frappe.scrub(doctype)
filters = [[f"ifnull(`{parent_field}`,'')", "=", parent], ["docstatus", "<", 2]]
if frappe.db.has_column(doctype, "disabled") and not include_disabled:
filters.append(["disabled", "=", False])
@ -75,7 +75,7 @@ def make_tree_args(**kwarg):
kwarg.pop("cmd", None)
doctype = kwarg["doctype"]
parent_field = "parent_" + doctype.lower().replace(" ", "_")
parent_field = "parent_" + frappe.scrub(doctype)
if kwarg["is_root"] == "false":
kwarg["is_root"] = False

3
frappe/public/js/frappe/views/treeview.js
View file

@ -352,7 +352,8 @@ frappe.views.TreeView = class TreeView {
});
var args = $.extend({}, me.args);
args["parent_" + me.doctype.toLowerCase().replace(/ /g, "_")] = me.args["parent"];
args["parent_" + me.doctype.toLowerCase().replace(/ /g, "_").replace(/-/g, "_")] =
me.args["parent"];
d.set_value("is_group", 0);
d.set_values(args);