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 diff --git a/app/models/dojo.rb b/app/models/dojo.rb index ec1bc66b1..a9d85a326 100644 --- a/app/models/dojo.rb +++ b/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