From 9749b2eb0006355ffa352307ce5b3c5f39773a6b Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 13 Dec 2023 14:13:47 +0000 Subject: [PATCH] feat: move scheme alphabeticising into manager --- app/controllers/organisations_controller.rb | 2 +- app/controllers/schemes_controller.rb | 2 +- app/services/filter_manager.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb index 94233c3c1..3bf4cf5a9 100644 --- a/app/controllers/organisations_controller.rb +++ b/app/controllers/organisations_controller.rb @@ -23,7 +23,7 @@ class OrganisationsController < ApplicationController def schemes organisation_schemes = Scheme.where(owning_organisation: [@organisation] + @organisation.parent_organisations) - @pagy, @schemes = pagy(filter_manager.filtered_schemes(organisation_schemes, search_term, session_filters).order_by_service_name) + @pagy, @schemes = pagy(filter_manager.filtered_schemes(organisation_schemes, search_term, session_filters)) @searched = search_term.presence @total_count = organisation_schemes.size @filter_type = "schemes" diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb index 383e43918..682e1bc02 100644 --- a/app/controllers/schemes_controller.rb +++ b/app/controllers/schemes_controller.rb @@ -15,7 +15,7 @@ class SchemesController < ApplicationController redirect_to schemes_organisation_path(current_user.organisation) unless current_user.support? all_schemes = Scheme.all - @pagy, @schemes = pagy(filter_manager.filtered_schemes(all_schemes, search_term, session_filters).order_by_service_name) + @pagy, @schemes = pagy(filter_manager.filtered_schemes(all_schemes, search_term, session_filters)) @searched = search_term.presence @total_count = all_schemes.size @filter_type = "schemes" diff --git a/app/services/filter_manager.rb b/app/services/filter_manager.rb index c8665752d..1a824b2e2 100644 --- a/app/services/filter_manager.rb +++ b/app/services/filter_manager.rb @@ -59,7 +59,7 @@ class FilterManager schemes = schemes.public_send("filter_by_#{category}", values, user) end - schemes + schemes.order_by_service_name end def self.filter_locations(locations, search_term, filters, user)