From 3b89c3f664ba8f8a76f394b27c36e06c100fda1b Mon Sep 17 00:00:00 2001 From: Rutwik Hiwalkar Date: Fri, 3 May 2024 23:27:21 +0530 Subject: [PATCH] fix: new and add child button for empty tree doctype - The second check in treeview.js is useless - If the node being created is root-node(i.e. doctype(name) is parent then don't set parent) --- frappe/desk/treeview.py | 4 +++- frappe/public/js/frappe/views/treeview.js | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py index 6967143602..2f315924b5 100644 --- a/frappe/desk/treeview.py +++ b/frappe/desk/treeview.py @@ -82,6 +82,8 @@ def make_tree_args(**kwarg): if kwarg["is_root"] == "true": kwarg["is_root"] = True - kwarg.update({parent_field: kwarg.get("parent") or kwarg.get(parent_field)}) + parent = kwarg.get("parent") or kwarg.get(parent_field) + if doctype != parent: + kwarg.update({parent_field: parent}) return frappe._dict(kwarg) diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index 5130863f93..097f99b77a 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -180,12 +180,12 @@ frappe.views.TreeView = class TreeView { args: me.args, callback: function (r) { if (r.message) { - if (r.message.length > 1) { - me.root_label = me.doctype; - me.root_value = ""; - } else { + if (r.message.length == 1) { me.root_label = r.message[0]["value"]; me.root_value = me.root_label; + } else { + me.root_label = me.doctype; + me.root_value = ""; } me.make_tree(); }