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

fix: formatting fixes

Browse source
This commit is contained in:
prssanna 2020-06-08 20:06:56 +05:30
parent 481c838b9b
commit 43c8b476b1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/desk/doctype/dashboard_chart/dashboard_chart.js
View file

@ -12,16 +12,15 @@ frappe.ui.form.on('Dashboard Chart', {
before_save: function(frm) {
let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
let static_filters = JSON.parse(frm.doc.filters_json || 'null');
console.log(dynamic_filters, static_filters);
if (dynamic_filters) {
if ($.isArray(static_filters)) {
static_filters = static_filters.filter(static_filter => {
for (let dynamic_filter of dynamic_filters) {
if (static_filter[0] == dynamic_filter[0]
&& static_filter[1] == dynamic_filter[1]) {
return false;
return false;
}
};
}
return true;
});
} else {
@ -518,7 +517,7 @@ frappe.ui.form.on('Dashboard Chart', {
<td>${filter[1]}</td>
<td>${filter[2] || ""}</td>
<td>${filter[3]}</td>
</tr>`
</tr>`;
});
} else {
let condition = '=';