From f4d6dcecdff40eeeea63664c81783516a6eec7a5 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 19 Nov 2017 13:23:40 +0900
Subject: [PATCH 1/3] Remove default_scope in Dojo

---
 app/models/dojo.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/dojo.rb b/app/models/dojo.rb
index ec1bc66b1..0ad0ea12c 100644
--- a/app/models/dojo.rb
+++ b/app/models/dojo.rb
@@ -9,7 +9,6 @@ class Dojo < ApplicationRecord
   has_many :event_histories,     dependent: :destroy
 
   serialize :tags
-  default_scope -> { order(order: :asc) }
   before_save { self.email = self.email.downcase }
 
   validates :name,        presence: true, length: { maximum: 50 }

From c22925be0c54c2028ac85bfebac75a3c392861eb Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 19 Nov 2017 13:47:36 +0900
Subject: [PATCH 2/3] Add scope for default order

---
 app/models/dojo.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/dojo.rb b/app/models/dojo.rb
index 0ad0ea12c..a9d85a326 100644
--- a/app/models/dojo.rb
+++ b/app/models/dojo.rb
@@ -11,6 +11,8 @@ class Dojo < ApplicationRecord
   serialize :tags
   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

From c9eaac817862c5b1534a567f815c4bb8ea7a30c9 Mon Sep 17 00:00:00 2001
From: nalabjp <nalabjp@gmail.com>
Date: Sun, 19 Nov 2017 13:48:05 +0900
Subject: [PATCH 3/3] Apply default order for Dojo list

---
 app/controllers/plain_page_controller.rb   | 2 +-
 app/controllers/static_pages_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/plain_page_controller.rb b/app/controllers/plain_page_controller.rb
index 2d814c06a..8d095d628 100644
--- a/app/controllers/plain_page_controller.rb
+++ b/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
diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
index c048f19e4..a25a1e253 100644
--- a/app/controllers/static_pages_controller.rb
+++ b/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