diff --git a/app/controllers/regions_controller.rb b/app/controllers/regions_controller.rb index 45b31856..9e22b52e 100644 --- a/app/controllers/regions_controller.rb +++ b/app/controllers/regions_controller.rb @@ -1,4 +1,12 @@ # Manage regions, mostly get stats out of them -class RegionsController < InheritedResources::Base +class RegionsController < ApplicationController has_scope :region + + before_action :set_regions, only: [:index] + + private + + def set_regions + @regions = apply_scopes Region.local + end end diff --git a/app/models/region.rb b/app/models/region.rb index e7e5b2ad..be18da78 100644 --- a/app/models/region.rb +++ b/app/models/region.rb @@ -6,6 +6,7 @@ class Region < ApplicationRecord has_many :orgas, dependent: :destroy default_scope { order :name } + scope :local, ->(*) { where url: nil } scope :region, (lambda do |region| return if region.nil? || region == 'all' || region.to_i.zero? temp = Region.find region diff --git a/app/views/regions/index.json.jbuilder b/app/views/regions/index.json.jbuilder new file mode 100644 index 00000000..df68ea7b --- /dev/null +++ b/app/views/regions/index.json.jbuilder @@ -0,0 +1,3 @@ +json.array!(@regions) do |region| + json.extract! region, :id, :region_id, :name, :code +end