Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: do not sort by number of connections

Browse Source
This commit is contained in:
Rucha Mahabal 2021-07-08 11:23:50 +05:30
parent a48b23e6a5
commit b6715189fb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hr/page/organizational_chart/organizational_chart.py
View File

@ -24,7 +24,6 @@ def get_children(parent=None, company=None):
employee.connections = get_connections(employee.id) employee.connections = get_connections(employee.id)
employee.expandable = 1 if is_expandable else 0 employee.expandable = 1 if is_expandable else 0
employees.sort(key=lambda x: x['connections'], reverse=True)
return employees return employees

8
erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
View File

@ -135,8 +135,8 @@ erpnext.HierarchyChart = class {
} }
}).then(r => { }).then(r => {
if (r.message.length) { if (r.message.length) {
let expand_node = undefined;
let node = undefined; let node = undefined;
let first_root = undefined;
$.each(r.message, (i, data) => { $.each(r.message, (i, data) => {
node = new me.Node({ node = new me.Node({
@ -151,11 +151,11 @@ erpnext.HierarchyChart = class {
is_root: true is_root: true
}); });
if (i == 0) if (!expand_node && data.connections)
first_root = node; expand_node = node;
}); });
me.expand_node(first_root); me.expand_node(expand_node);
} }
}); });
} }