From b6bac6d11f01c195d602cc7affd23713e31cfeb0 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Sat, 9 Mar 2019 12:13:41 +0100 Subject: [PATCH] Moved prepareFilter to a better place --- app/scripts/models/app-model.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js index aaf7a8a1..61d9aaed 100644 --- a/app/scripts/models/app-model.js +++ b/app/scripts/models/app-model.js @@ -240,7 +240,7 @@ const AppModel = Backbone.Model.extend({ }, setFilter: function(filter) { - this.filter = filter; + this.filter = this.prepareFilter(filter); this.filter.subGroups = this.settings.get('expandGroups'); if (!this.filter.advanced && this.advancedSearch) { this.filter.advanced = this.advancedSearch; @@ -282,7 +282,6 @@ const AppModel = Backbone.Model.extend({ }, getEntriesByFilter: function(filter) { - filter = this.prepareFilter(filter); const entries = new EntryCollection(); this.files.forEach(file => { file.forEachEntry(filter, entry => entries.push(entry));