From a23a8ddc2ed98e6fb5b91915a9e2c131d9a88712 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Aug 2017 12:18:28 +0530 Subject: [PATCH 1/3] [fix] search icon for reportview --- frappe/public/js/frappe/list/list_view.js | 1 + frappe/public/js/frappe/ui/base_list.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index a7024a9fb7..0557adc2ac 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -127,6 +127,7 @@ frappe.views.ListView = frappe.ui.BaseList.extend({ return; } + this.is_list_view = true; this.page_name = 'List/' + this.doctype; this.dirty = true; this.tags_shown = false; diff --git a/frappe/public/js/frappe/ui/base_list.js b/frappe/public/js/frappe/ui/base_list.js index f320be9699..0594ea25cc 100644 --- a/frappe/public/js/frappe/ui/base_list.js +++ b/frappe/public/js/frappe/ui/base_list.js @@ -185,6 +185,11 @@ frappe.ui.BaseList = Class.extend({ } if (this.meta) { + var filter_count = 1; + if(this.is_list_view) { + $(``) + .prependTo(this.page.page_form); + } this.page.add_field({ fieldtype: 'Data', label: 'ID', From 8c49f0b7a7cea5c61e1d5a8faecf72e49e29eeb8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Aug 2017 12:41:06 +0530 Subject: [PATCH 2/3] [fix] lint --- frappe/public/js/frappe/ui/base_list.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/base_list.js b/frappe/public/js/frappe/ui/base_list.js index 0594ea25cc..6426db7988 100644 --- a/frappe/public/js/frappe/ui/base_list.js +++ b/frappe/public/js/frappe/ui/base_list.js @@ -185,7 +185,6 @@ frappe.ui.BaseList = Class.extend({ } if (this.meta) { - var filter_count = 1; if(this.is_list_view) { $(``) .prependTo(this.page.page_form); From 224a06eef7890b0eb4e6d3dede7708d446b66d14 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Aug 2017 12:51:14 +0530 Subject: [PATCH 3/3] [fix] throttle running multiple times (#3962) * [fix] throttle running multiple times * [fix] lint --- frappe/public/js/frappe/views/reports/query_report.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 7e0bc14a13..ceb0a696bb 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -364,6 +364,16 @@ frappe.views.QueryReport = Class.extend({ } }, refresh: function() { + // throttle + // stop refresh from being called multiple times (from triggers ?) + if (!this.request_refresh) { + this.request_refresh = setTimeout(() => { + this._refresh(); + this.request_refresh = null; + }, 300); + } + }, + _refresh: function() { // Run var me = this;