fix: include all fields of a doctype in doctype field map
This commit is contained in:
parent
fb55c6d95c
commit
87c52bb296
1 changed files with 13 additions and 6 deletions
|
|
@ -1935,12 +1935,15 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
|
|||
fieldtype: df.fieldtype,
|
||||
label: df.label,
|
||||
insert_after_index: insert_after_index,
|
||||
link_field: this.doctype_field_map[values.doctype],
|
||||
link_field: {
|
||||
fieldname: values.fieldname,
|
||||
names: this.doctype_field_map[values.doctype][values.fieldname]
|
||||
.names,
|
||||
},
|
||||
doctype: values.doctype,
|
||||
options: df.options,
|
||||
width: 100,
|
||||
});
|
||||
|
||||
this.custom_columns = this.custom_columns.concat(custom_columns);
|
||||
frappe.call({
|
||||
method: "frappe.desk.query_report.get_data_for_custom_field",
|
||||
|
|
@ -1948,7 +1951,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
|
|||
field: values.field,
|
||||
doctype: values.doctype,
|
||||
names: Array.from(
|
||||
this.doctype_field_map[values.doctype].names
|
||||
this.doctype_field_map[values.doctype][values.fieldname]
|
||||
.names
|
||||
),
|
||||
},
|
||||
callback: (r) => {
|
||||
|
|
@ -2094,12 +2098,15 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
|
|||
);
|
||||
|
||||
doctypes.forEach((doc) => {
|
||||
this.doctype_field_map[doc.doctype] = { fieldname: doc.fieldname, names: new Set() };
|
||||
if (!this.doctype_field_map[doc.doctype]) {
|
||||
this.doctype_field_map[doc.doctype] = {};
|
||||
}
|
||||
this.doctype_field_map[doc.doctype][doc.fieldname] = {};
|
||||
this.doctype_field_map[doc.doctype][doc.fieldname] = { names: new Set() };
|
||||
});
|
||||
|
||||
this.data.forEach((row) => {
|
||||
doctypes.forEach((doc) => {
|
||||
this.doctype_field_map[doc.doctype].names.add(row[doc.fieldname]);
|
||||
this.doctype_field_map[doc.doctype][doc.fieldname].names.add(row[doc.fieldname]);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue