浏览代码

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

version-14
Saurabh 8 年前
committed by Rushabh Mehta
父节点
当前提交
8c0a67cde8
共有 2 个文件被更改,包括 18 次插入12 次删除
  1. +18
    -11
      frappe/desk/treeview.py
  2. +0
    -1
      frappe/public/js/frappe/views/treeview.js

+ 18
- 11
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()
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 查看文件

@@ -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,


正在加载...
取消
保存