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

fix: check for empty report filters while creating report type dashboard chart

Browse source
This commit is contained in:
Rucha Mahabal 2020-07-27 21:39:00 +05:30
parent 2792a1cac9
commit c8817e5221
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frappe/public/js/frappe/widgets/chart_widget.js
View file

@ -656,14 +656,15 @@ export default class ChartWidget extends Widget {
}
update_default_date_filters(report_filters, chart_filters) {
report_filters.map(f => {
if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
if (f.reqd || chart_filters[f.fieldname]) {
chart_filters[f.fieldname] = f.default;
if (report_filters) {
report_filters.map(f => {
if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
if (f.reqd || chart_filters[f.fieldname]) {
chart_filters[f.fieldname] = f.default;
}
}
}
});
});
}
return chart_filters;
}