From 0d082bf3784f4bf45f66ce15bb7a45c3728eaecc Mon Sep 17 00:00:00 2001 From: Molkobain Date: Wed, 7 Nov 2018 14:43:03 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B01487=20Search:=20Removing=20an=20empty?= =?UTF-8?q?=20criterion=20doesn't=20refresh=20the=20results=20anymore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/search/search_form_criteria.js | 4 +++- js/search/search_form_handler.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js index 11df536c6..f6f2409e8 100644 --- a/js/search/search_form_criteria.js +++ b/js/search/search_form_criteria.js @@ -253,7 +253,9 @@ $(function() _remove: function() { this.element.remove(); - this.handler.triggerHandler('itop.search.criteria.removed'); + + var bHadValues = (Array.isArray(this.options.values) && (this.options.values.length > 0)); + this.handler.triggerHandler('itop.search.criteria.removed', {had_values: bHadValues}); }, // - Mark / Unmark criteria as draft (new value not applied) _markAsDraft: function() diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js index 8087d1f76..71a219391 100644 --- a/js/search/search_form_handler.js +++ b/js/search/search_form_handler.js @@ -909,7 +909,7 @@ $(function() _onCriteriaRemoved: function(oData) { this._updateSearch(); - if(this.options.auto_submit === true) + if( (this.options.auto_submit === true) && (oData.had_values === true) ) { this._submit(); }