Merge pull request #202 from coderdojo-japan/dojo-order

Dojo order

Author: yasulab

app/controllers/plain_page_controller.rb

@@ -2,6 +2,6 @@ class PlainPageController < CmsController
   #skip_before_action :verify_authenticity_token, only: [:index]
 
   def index
-    @dojos = Dojo.all
+    @dojos = Dojo.default_order.all
   end
 end

app/controllers/static_pages_controller.rb

@@ -1,7 +1,7 @@
 class StaticPagesController < ApplicationController
   def home
     @dojo_count = Dojo.count
-    @regions_and_dojos = Dojo.includes(:prefecture).group_by { |dojo| dojo.prefecture.region }
+    @regions_and_dojos = Dojo.includes(:prefecture).default_order.group_by { |dojo| dojo.prefecture.region }
   end
 
   def letsencrypt

app/models/dojo.rb

@@ -9,9 +9,10 @@ class Dojo < ApplicationRecord
   has_many :event_histories,     dependent: :destroy
 
   serialize :tags
-  default_scope -> { order(order: :asc) }
   before_save { self.email = self.email.downcase }
 
+  scope :default_order, -> { order(prefecture_id: :asc) }
+
   validates :name,        presence: true, length: { maximum: 50 }
   validates :email,       presence: false
   validates :order,       presence: false