From d63e277fc60098060bcc7dd91313dcc889ba2cb1 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 8 Feb 2016 10:07:44 -0500 Subject: [PATCH] (js) Apply search filters when reloading mailbox Fixes #3507 --- UI/WebServerResources/js/Mailer/Mailbox.service.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js index d8aeb4bc3..f58f68eb2 100644 --- a/UI/WebServerResources/js/Mailer/Mailbox.service.js +++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js @@ -275,6 +275,7 @@ options.filters = _.reject(filters, function(filter) { return angular.isUndefined(filter.searchInput) || filter.searchInput.length === 0; }); + // Decompose filters that match two fields _.each(options.filters, function(filter) { var secondFilter, match = filter.searchBy.match(/(\w+)_or_(\w+)/); @@ -292,7 +293,7 @@ if (!Mailbox.$virtualMode) { var refreshViewCheck = Mailbox.$Preferences.defaults.SOGoRefreshViewCheck; if (refreshViewCheck && refreshViewCheck != 'manually') { - var f = angular.bind(_this, Mailbox.prototype.$filter); + var f = angular.bind(_this, Mailbox.prototype.$filter, null, filters); Mailbox.$refreshTimeout = Mailbox.$timeout(f, refreshViewCheck.timeInterval()*1000); } }