diff --git a/app/components/search_component.rb b/app/components/search_component.rb index d63cf3977..b4a012225 100644 --- a/app/components/search_component.rb +++ b/app/components/search_component.rb @@ -36,7 +36,7 @@ private %r{organisations/\d+/stock-owners}, %r{organisations/\d+/managing-agents}, %r{sales-logs/bulk-uploads}, - %r{lettings-logs/bulk-uploads} + %r{lettings-logs/bulk-uploads}, ].any? { |pattern| request.path.match?(pattern) } end end diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index 0c08d58f0..683da6469 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -350,30 +350,35 @@ private def assigned_to_filter_selected?(selected_filters, value) return true if !selected_filters.key?("user") && value == :all return true if selected_filters["assigned_to"] == "specific_user" && value == :specific_user + false end def owning_organisation_filter_selected?(selected_filters, value) return true if !selected_filters.key?("owning_organisation") && value == :all return true if (selected_filters["owning_organisation"].present? || selected_filters["owning_organisation_text_search"].present?) && value == :specific_org + false end def managing_organisation_filter_selected?(selected_filters, value) return true if !selected_filters.key?("managing_organisation") && value == :all return true if (selected_filters["managing_organisation"].present? || selected_filters["managing_organisation_text_search"].present?) && value == :specific_org + false end def uploaded_by_filter_selected?(selected_filters, value) return true if !selected_filters.key?("user") && value == :all return true if selected_filters["uploaded_by"] == "specific_user" && value == :specific_user + false end def uploading_organisation_filter_selected?(selected_filters, value) return true if !selected_filters.key?("uploading_organisation") && value == :all return true if (selected_filters["uploading_organisation"].present? || selected_filters["uploading_organisation_text_search"].present?) && value == :specific_org + false end end