schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Org Chart fixes (#27290)

Browse Source 
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes
This commit is contained in:
Rucha Mahabal
2021-09-01 23:07:26 +05:30
committed by GitHub
parent dea5c34d8d
commit f828d853e3
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/utilities/hierarchy_chart.py
View File

@@ -6,17 +6,21 @@ import frappe
from frappe import _
@frappe.whitelist()
def get_all_nodes(parent, parent_name, method, company):
def get_all_nodes(method, company):
'''Recursively gets all data from nodes'''
method = frappe.get_attr(method)
if method not in frappe.whitelisted:
frappe.throw(_('Not Permitted'), frappe.PermissionError)
data = method(parent, company)
result = [dict(parent=parent, parent_name=parent_name, data=data)]
root_nodes = method(company=company)
result = []
nodes_to_expand = []
nodes_to_expand = [{'id': d.get('id'), 'name': d.get('name')} for d in data if d.get('expandable')]
for root in root_nodes:
data = method(root.id, company)
result.append(dict(parent=root.id, parent_name=root.name, data=data))
nodes_to_expand.extend([{'id': d.get('id'), 'name': d.get('name')} for d in data if d.get('expandable')])
while nodes_to_expand:
parent = nodes_to_expand.pop(0)