Region selector and filter better scoped

app/models/region.rb

@@ -6,7 +6,8 @@ class Region < ApplicationRecord
   has_many :orgas, dependent: :destroy
 
   default_scope { order :name }
-  scope :local, ->(*) { where 'url IS NULL OR url = \'\'' }
+  scope :top, ->(*) { where(region: nil).includes(:regions).reorder :code }
+  scope :local, ->(*) { where(url: nil).or(Region.where(url: '')) }
   scope :region, (lambda do |region|
     return if region.nil? || region == 'all' || region.to_i.zero?
 

app/views/regions/_filter.haml

@@ -1,4 +1,3 @@
 -# Choose a region to filter events with
 %nav.region_filter
-  %ul= render partial: '/regions/filter_region',
+  %ul= render partial: '/regions/filter_region', collection: Region.top
-    collection: Region.where(region: nil).includes(:regions)

app/views/regions/_selector.haml

@@ -1,3 +1,5 @@
-.radios= render partial: '/regions/selector_region',
+-# Select a region for an event or organisation
-  collection: Region.where(region: nil, url: ''),
+.radios
-  locals: { f: f }
+  = render partial: '/regions/selector_region',
+    collection: Region.top.local,
+    locals: { f: f }