about summary refs log tree commit diff stats
path: root/app/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/pokeviewer/pokemon_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/pokeviewer/pokemon_controller.rb b/app/controllers/pokeviewer/pokemon_controller.rb index 2c38e56..d0bf432 100644 --- a/app/controllers/pokeviewer/pokemon_controller.rb +++ b/app/controllers/pokeviewer/pokemon_controller.rb
@@ -5,7 +5,7 @@ module Pokeviewer
5 before_action :load_pokemon, only: [:show, :embed] 5 before_action :load_pokemon, only: [:show, :embed]
6 6
7 def index 7 def index
8 pokemon = Pokemon.order("trainer_id IS NULL DESC"). 8 pokemon = Pokemon.order(Arel.sql("trainer_id IS NULL DESC")).
9 order(trainer_id: :asc). 9 order(trainer_id: :asc).
10 order(box: :asc). 10 order(box: :asc).
11 order(slot: :asc). 11 order(slot: :asc).