diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-10 11:54:08 -0500 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-10 11:54:08 -0500 |
| commit | e28f6b73ab7f2e59605ebd800e921a6146fc49ae (patch) | |
| tree | 087d61ffbfde35123c3ec0c88302a81fbfef742b /app | |
| parent | 32d4d3c1fc54721c3c99a15415cf698475237984 (diff) | |
| download | pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.tar.gz pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.tar.bz2 pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.zip | |
Updated to Rails 7.0.3
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/config/pokeviewer_manifest.js | 1 | ||||
| -rw-r--r-- | app/controllers/pokeviewer/pokemon_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/pokeviewer/pokemon/embed.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
| diff --git a/app/assets/config/pokeviewer_manifest.js b/app/assets/config/pokeviewer_manifest.js index 3b3efbb..8bd7006 100644 --- a/app/assets/config/pokeviewer_manifest.js +++ b/app/assets/config/pokeviewer_manifest.js | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | //= link_directory ../javascripts/pokeviewer .js | 1 | //= link_directory ../javascripts/pokeviewer .js |
| 2 | //= link_directory ../stylesheets/pokeviewer .css | 2 | //= link_directory ../stylesheets/pokeviewer .css |
| 3 | //= link_tree ../images/pokeviewer | ||
| 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). |
| diff --git a/app/views/pokeviewer/pokemon/embed.html.haml b/app/views/pokeviewer/pokemon/embed.html.haml index f4848de..3c82052 100644 --- a/app/views/pokeviewer/pokemon/embed.html.haml +++ b/app/views/pokeviewer/pokemon/embed.html.haml | |||
| @@ -12,4 +12,4 @@ | |||
| 12 | %li.ptabe-button.ptabe-moves= link_to "Moves", "\#", data: {tab: "moves"} | 12 | %li.ptabe-button.ptabe-moves= link_to "Moves", "\#", data: {tab: "moves"} |
| 13 | %li.ptabe-button.ptabe-contest= link_to "Contest", "\#", data: {tab: "contest"} | 13 | %li.ptabe-button.ptabe-contest= link_to "Contest", "\#", data: {tab: "contest"} |
| 14 | %li.ptabe-button.ptabe-ribbons= link_to "Ribbons", "\#", data: {tab: "ribbons"} | 14 | %li.ptabe-button.ptabe-ribbons= link_to "Ribbons", "\#", data: {tab: "ribbons"} |
| 15 | = render @pokemon | 15 | = render @revision |