From a4a977f3fd38665db70f0e0726202966af3186d6 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Tue, 11 Jul 2023 12:38:07 +0100 Subject: [PATCH] refactor: make filters_count more readable --- app/helpers/filters_helper.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index 33c64fb45..d48208a9b 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -67,11 +67,11 @@ private end def filters_count(filters) - filters.values.sum do |category| - if category.is_a?(String) - category != "all" ? 1 : 0 - else - category.count(&:present?) + filters.each.sum do |category, category_filters| + if %w[status years].include?(category) + category_filters.count(&:present?) + elsif %w[user organisation].include?(category) + category_filters != "all" ? 1 : 0 end end end