From 33b9bca0571c6ef944eeabe369544e9984b44a4c Mon Sep 17 00:00:00 2001 From: Zarrar Date: Fri, 20 Apr 2018 14:08:46 +0530 Subject: [PATCH] [Fix] Fix treeview adding child to wrong parent and Freeze screen while adding a node. (#5464) * fix parent wrong selected, freeze screen while adding a node * unfreeze dom always * fix translation method --- frappe/public/js/frappe/views/treeview.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index 832e193aa6..859498d5d2 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -255,7 +255,6 @@ frappe.views.TreeView = Class.extend({ var v = d.get_values(); if(!v) return; - var node = me.tree.get_selected_node(); v.parent = node.label; v.doctype = me.doctype; @@ -266,19 +265,24 @@ frappe.views.TreeView = Class.extend({ v['is_root'] = false; } + d.hide(); + frappe.dom.freeze(__('Creating {0}', [me.doctype])); + $.extend(args, v) return frappe.call({ method: me.opts.add_tree_node || "frappe.desk.treeview.add_node", args: args, callback: function(r) { if(!r.exc) { - d.hide(); if(node.expanded) { me.tree.toggle_node(node); } me.tree.load_children(node, true); } - } + }, + always: function() { + frappe.dom.unfreeze(); + }, }); }); d.show();