Browse Source

feat: move scheme alphabeticising into manager

pull/2083/head
natdeanlewissoftwire 2 years ago
parent
commit
9749b2eb00
  1. 2
      app/controllers/organisations_controller.rb
  2. 2
      app/controllers/schemes_controller.rb
  3. 2
      app/services/filter_manager.rb

2
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"

2
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"

2
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)

Loading…
Cancel
Save