vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #9408 from ruchamahabal/fix_report_status_column

Browse source 
fix(Report View): don't render/add status if value not found
This commit is contained in:
mergify[bot] 2020-02-09 15:33:38 +00:00 • committed by GitHub
commit 08e18c649e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -791,7 +791,13 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
let std_fields = frappe.model.std_fields.filter( df => df.fieldname !== 'docstatus');
// add status field derived from docstatus, if status is not a standard field
if (!frappe.meta.has_field(this.doctype, 'status')) {
let has_status_values = false;
if (this.data) {
has_status_values = frappe.get_indicator(this.data[0], this.doctype);
}
if (!frappe.meta.has_field(this.doctype, 'status') && has_status_values) {
doctype_fields = [{
label: __('Status'),
fieldname: 'docstatus',
@ -1038,18 +1044,23 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
if (col.field === 'docstatus' && !frappe.meta.has_field(this.doctype, 'status')) {
// get status from docstatus
let status = frappe.get_indicator(d, this.doctype);
if (!status[0]) {
// get_indicator returns the dependent field's condition as the 3rd parameter
let dependent_col = status[2].split(',')[0];
// add status dependency column
this.add_status_dependency_column(dependent_col, this.doctype);
if (status) {
if (!status[0]) {
// get_indicator returns the dependent field's condition as the 3rd parameter
let dependent_col = status[2].split(',')[0];
// add status dependency column
this.add_status_dependency_column(dependent_col, this.doctype);
}
return {
name: d.name,
doctype: col.docfield.parent,
content: status[0],
editable: false
};
} else {
// no status values found
this.remove_column_from_datatable(col);
}
return {
name: d.name,
doctype: col.docfield.parent,
content: status[0],
editable: false
};
} else if (col.field in d) {
const value = d[col.field];
return {