From 6301b208e4f8a990b4b2029b8a15ceaee00a31d5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:20:46 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20Treeview=20DB=20lookup=20should=20perfor?= =?UTF-8?q?m=20the=20same=20preperation=20operation=E2=80=A6=20(backport?= =?UTF-8?q?=20#26199)=20(#26258)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Co-authored-by: Ankush Menat --- frappe/desk/treeview.py | 4 ++-- frappe/public/js/frappe/views/treeview.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py index b74582edc8..6967143602 100644 --- a/frappe/desk/treeview.py +++ b/frappe/desk/treeview.py @@ -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 diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index bbf35104d1..5130863f93 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -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);