diff --git a/app/controllers/providers_controller.rb b/app/controllers/providers_controller.rb index 91a371b3..f8a6ba5d 100644 --- a/app/controllers/providers_controller.rb +++ b/app/controllers/providers_controller.rb @@ -3,7 +3,7 @@ class ProvidersController < ApplicationController before_action :redirect_contributors def index - @providers = Provider.all + @providers = Provider.includes(:regions).order(:name) end def show diff --git a/app/controllers/regions_controller.rb b/app/controllers/regions_controller.rb index 1370295b..4059933b 100644 --- a/app/controllers/regions_controller.rb +++ b/app/controllers/regions_controller.rb @@ -4,7 +4,11 @@ class RegionsController < ApplicationController # GET /regions def index - @regions = Region.all + @regions = Region + .left_joins(:providers) + .select("regions.*, COUNT(providers.id) AS providers_count") + .group("regions.id") + .order(:name) end # GET /regions/1 diff --git a/app/views/providers/_form.html.erb b/app/views/providers/_form.html.erb index edb3b7de..b977571c 100644 --- a/app/views/providers/_form.html.erb +++ b/app/views/providers/_form.html.erb @@ -25,12 +25,12 @@ -