From 8c0a67cde8db4f90bd29f9fc956dd2a8977ff97f Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 12 Jan 2017 11:26:14 +0530 Subject: [PATCH] [fix] make tree params which includs custom mandatory params (#2571) --- frappe/desk/treeview.py | 29 ++++++++++++++--------- frappe/public/js/frappe/views/treeview.js | 1 - 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py index 6b0cef4ec3..ac35841d4c 100644 --- a/frappe/desk/treeview.py +++ b/frappe/desk/treeview.py @@ -46,17 +46,24 @@ def get_children(): @frappe.whitelist() def add_node(): - doctype = frappe.form_dict.get('doctype') - parent_field = 'parent_' + doctype.lower().replace(' ', '_') - name_field = doctype.lower().replace(' ', '_') + '_name' + args = make_tree_args(**frappe.form_dict) + doc = frappe.get_doc(args) - doc = frappe.new_doc(doctype) - doc.update({ - name_field: frappe.form_dict[name_field], - parent_field: frappe.form_dict['parent'], - "is_group": frappe.form_dict['is_group'] - }) - if doctype == "Sales Person": + if args.doctype == "Sales Person": doc.employee = frappe.form_dict.get('employee') - doc.save() \ No newline at end of file + doc.save() + +def make_tree_args(**kwarg): + del kwarg['cmd'] + + doctype = kwarg['doctype'] + parent_field = 'parent_' + doctype.lower().replace(' ', '_') + name_field = doctype.lower().replace(' ', '_') + '_name' + + kwarg.update({ + name_field: kwarg[name_field], + parent_field: kwarg["parent"] + }) + + return frappe._dict(kwarg) diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index 3cde94db3c..a9e8b7d27f 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -214,7 +214,6 @@ frappe.views.TreeView = Class.extend({ } $.extend(args, v) - return frappe.call({ method: me.opts.add_tree_node || "frappe.desk.treeview.add_node", args: args,