nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 05:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: treeview fixes (#18803)

Browse Source
This commit is contained in:
Himanshu
2019-09-05 16:12:33 +05:30
committed by Nabin Hait
parent cffe577028
commit 6298da4458
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
View File

@@ -52,7 +52,19 @@ class QualityProcedure(NestedSet):
def get_children(doctype, parent=None, parent_quality_procedure=None, is_root=False): def get_children(doctype, parent=None, parent_quality_procedure=None, is_root=False):
if parent is None or parent == "All Quality Procedures": if parent is None or parent == "All Quality Procedures":
parent = "" parent = ""
return frappe.get_all(doctype, fields=["name as value", "is_group as expandable"], filters={"parent_quality_procedure": parent})
return frappe.db.sql("""
select
name as value,
is_group as expandable
from
`tab{doctype}`
where
ifnull(parent_quality_procedure, "")={parent}
""".format(
doctype = doctype,
parent=frappe.db.escape(parent)
), as_dict=1)
@frappe.whitelist() @frappe.whitelist()
def add_node(): def add_node():

4
erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js
View File

@@ -1,5 +1,3 @@
frappe.provide("frappe.treeview_settings");
frappe.treeview_settings["Quality Procedure"] = { frappe.treeview_settings["Quality Procedure"] = {
ignore_fields:["parent_quality_procedure"], ignore_fields:["parent_quality_procedure"],
get_tree_nodes: 'erpnext.quality_management.doctype.quality_procedure.quality_procedure.get_children', get_tree_nodes: 'erpnext.quality_management.doctype.quality_procedure.quality_procedure.get_children',
@@ -19,7 +17,7 @@ frappe.treeview_settings["Quality Procedure"] = {
], ],
breadcrumb: "Setup", breadcrumb: "Setup",
root_label: "All Quality Procedures", root_label: "All Quality Procedures",
get_tree_root: true, get_tree_root: false,
menu_items: [ menu_items: [
{ {
label: __("New Quality Procedure"), label: __("New Quality Procedure"),