Procházet zdrojové kódy

[fix] make tree params which includs custom mandatory params (#2571)

version-14
Saurabh před 8 roky
committed by Rushabh Mehta
rodič
revize
8c0a67cde8
2 změnil soubory, kde provedl 18 přidání a 12 odebrání
  1. +18
    -11
      frappe/desk/treeview.py
  2. +0
    -1
      frappe/public/js/frappe/views/treeview.js

+ 18
- 11
frappe/desk/treeview.py Zobrazit soubor

@@ -46,17 +46,24 @@ def get_children():


@frappe.whitelist() @frappe.whitelist()
def add_node(): 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.employee = frappe.form_dict.get('employee')


doc.save()
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)

+ 0
- 1
frappe/public/js/frappe/views/treeview.js Zobrazit soubor

@@ -214,7 +214,6 @@ frappe.views.TreeView = Class.extend({
} }


$.extend(args, v) $.extend(args, v)

return frappe.call({ return frappe.call({
method: me.opts.add_tree_node || "frappe.desk.treeview.add_node", method: me.opts.add_tree_node || "frappe.desk.treeview.add_node",
args: args, args: args,


Načítá se…
Zrušit
Uložit