diff --git a/app/models/card.rb b/app/models/card.rb index f062a49..1791328 100644 --- a/app/models/card.rb +++ b/app/models/card.rb @@ -21,6 +21,8 @@ class Card < ActiveRecord::Base validates :type, presence: true validates :awaken_type, presence: true + default_scope { order(:gameid) } + def dokkan? dokkan_id != nil end diff --git a/app/models/character.rb b/app/models/character.rb index b195202..2f5c3d1 100644 --- a/app/models/character.rb +++ b/app/models/character.rb @@ -1,4 +1,6 @@ class Character < ActiveRecord::Base validates :name, presence: true, uniqueness: { case_sensitive: false } + + default_scope { order(:name) } end diff --git a/app/models/link.rb b/app/models/link.rb index 0407fa0..78cbc00 100644 --- a/app/models/link.rb +++ b/app/models/link.rb @@ -3,4 +3,6 @@ class Link < ActiveRecord::Base validates :name, presence: true, uniqueness: true + + default_scope { order(:name) } end diff --git a/app/models/passive_skill.rb b/app/models/passive_skill.rb index 902dcc3..3a73da0 100644 --- a/app/models/passive_skill.rb +++ b/app/models/passive_skill.rb @@ -1,4 +1,6 @@ class PassiveSkill < ActiveRecord::Base validates :name, presence: true validates :description, presence: true + + default_scope { order(:name) } end diff --git a/app/models/super_attack.rb b/app/models/super_attack.rb index 20a802a..b8cda47 100644 --- a/app/models/super_attack.rb +++ b/app/models/super_attack.rb @@ -2,6 +2,8 @@ class SuperAttack < ActiveRecord::Base validates :name, presence: true validates :description, presence: true + default_scope { order(:name) } + def full "#{name} - #{description}" end