From f3953f2735db0ecbcff9f16dcf0b53cc3c8d2bc5 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 7 May 2024 16:38:08 +0100 Subject: [PATCH] Update method name --- app/controllers/lettings_logs_filters_controller.rb | 4 +--- app/helpers/filters_helper.rb | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/controllers/lettings_logs_filters_controller.rb b/app/controllers/lettings_logs_filters_controller.rb index dd9247271..97a3aa965 100644 --- a/app/controllers/lettings_logs_filters_controller.rb +++ b/app/controllers/lettings_logs_filters_controller.rb @@ -36,9 +36,7 @@ def filter_form_params end def session_filters - params["forms_filter_form"].each do |key, value| - params[key] = value - end + params["forms_filter_form"].each { |key, value| params[key] = value } if params["forms_filter_form"].present? params["years"] = [params["years"]] if params["years"].present? filter_manager.session_filters end diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index 38a4ec935..878c16f97 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -205,25 +205,25 @@ private end def formatted_years_filter(session_filters) - return unanswered_value if session_filters["years"].blank? + return unanswered_filter_value if session_filters["years"].blank? session_filters["years"].map { |year| year_combo(year.to_i) }.to_sentence end def formatted_status_filter(session_filters) - return unanswered_value if session_filters["status"].blank? + return unanswered_filter_value if session_filters["status"].blank? session_filters["status"].map { |status| status_filters[status] }.to_sentence end def formatted_needstype_filter(session_filters) - return unanswered_value if session_filters["needstypes"].blank? + return unanswered_filter_value if session_filters["needstypes"].blank? session_filters["needstypes"].map { |needstype| needstype_filters[needstype] }.to_sentence end def formatted_assigned_to_filter(session_filters) - return unanswered_value if session_filters["assigned_to"].blank? + return unanswered_filter_value if session_filters["assigned_to"].blank? return "All" if session_filters["assigned_to"].include?("all") return "You" if session_filters["assigned_to"].include?("you") @@ -243,7 +243,7 @@ private Organisation.find(session_filters["managing_organisation"].first)&.name end - def unanswered_value + def unanswered_filter_value "You didn’t answer this question".html_safe end end