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

fix: org chart connectors not rendered when Employee Naming is set to Full Name (#29997)

Browse Source
This commit is contained in:
Rucha Mahabal
2022-02-25 23:01:32 +05:30
committed by GitHub
parent e8e9bc4daa
commit 71d33081aa
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,12 +304,13 @@ erpnext.HierarchyChart = class {
} }
get_child_nodes(node_id) { get_child_nodes(node_id) {
let me = this;
return new Promise(resolve => { return new Promise(resolve => {
frappe.call({ frappe.call({
method: this.method, method: me.method,
args: { args: {
parent: node_id, parent: node_id,
company: this.company company: me.company
} }
}).then(r => resolve(r.message)); }).then(r => resolve(r.message));
}); });
@@ -350,12 +351,13 @@ erpnext.HierarchyChart = class {
} }
get_all_nodes() { get_all_nodes() {
let me = this;
return new Promise(resolve => { return new Promise(resolve => {
frappe.call({ frappe.call({
method: 'erpnext.utilities.hierarchy_chart.get_all_nodes', method: 'erpnext.utilities.hierarchy_chart.get_all_nodes',
args: { args: {
method: this.method, method: me.method,
company: this.company company: me.company
}, },
callback: (r) => { callback: (r) => {
resolve(r.message); resolve(r.message);
@@ -427,8 +429,8 @@ erpnext.HierarchyChart = class {
add_connector(parent_id, child_id) { add_connector(parent_id, child_id) {
// using pure javascript for better performance // using pure javascript for better performance
const parent_node = document.querySelector(`#${parent_id}`); const parent_node = document.getElementById(`${parent_id}`);
const child_node = document.querySelector(`#${child_id}`); const child_node = document.getElementById(`${child_id}`);
let path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); let path = document.createElementNS('http://www.w3.org/2000/svg', 'path');

9
erpnext/public/js/hierarchy_chart/hierarchy_chart_mobile.js
View File

@@ -235,7 +235,7 @@ erpnext.HierarchyChartMobile = class {
let me = this; let me = this;
return new Promise(resolve => { return new Promise(resolve => {
frappe.call({ frappe.call({
method: this.method, method: me.method,
args: { args: {
parent: node_id, parent: node_id,
company: me.company, company: me.company,
@@ -286,8 +286,8 @@ erpnext.HierarchyChartMobile = class {
} }
add_connector(parent_id, child_id) { add_connector(parent_id, child_id) {
const parent_node = document.querySelector(`#${parent_id}`); const parent_node = document.getElementById(`${parent_id}`);
const child_node = document.querySelector(`#${child_id}`); const child_node = document.getElementById(`${child_id}`);
const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
@@ -518,7 +518,8 @@ erpnext.HierarchyChartMobile = class {
level.nextAll('li').remove(); level.nextAll('li').remove();
let node_object = this.nodes[node.id]; let node_object = this.nodes[node.id];
let current_node = level.find(`#${node.id}`).detach(); let current_node = level.find(`[id="${node.id}"]`).detach();
current_node.removeClass('active-child active-path'); current_node.removeClass('active-child active-path');
node_object.expanded = 0; node_object.expanded = 0;