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

Merge pull request #13486 from surajshetty3416/fix-shortcut-filter

Browse source
This commit is contained in:
Suraj Shetty 2021-06-14 11:59:03 +05:30 • committed by GitHub
commit daeb615423
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/public/js/frappe/ui/filters/filter_list.js
View file

@ -323,9 +323,12 @@ frappe.ui.FilterGroup = class {
}
add_filters_to_filter_group(filters) {
filters.forEach((filter) => {
this.add_filter(filter[0], filter[1], filter[2], filter[3]);
});
if (filters.length) {
this.toggle_empty_filters(false);
filters.forEach((filter) => {
this.add_filter(filter[0], filter[1], filter[2], filter[3]);
});
}
}
add(filters, refresh = true) {

7
frappe/public/js/frappe/widgets/widget_dialog.js
View file

@ -271,18 +271,19 @@ class ShortcutDialog extends WidgetDialog {
}
process_data(data) {
let stats_filter = {};
if (this.dialog.get_value("type") == "DocType" && this.filter_group) {
let filters = this.filter_group.get_filters();
let stats_filter = null;
if (filters.length) {
stats_filter = {};
filters.forEach((arr) => {
stats_filter[arr[1]] = [arr[2], arr[3]];
});
data.stats_filter = JSON.stringify(stats_filter);
stats_filter = JSON.stringify(stats_filter);
}
data.stats_filter = stats_filter;
}
data.label = data.label