From e28f6b73ab7f2e59605ebd800e921a6146fc49ae Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sat, 10 Dec 2022 11:54:08 -0500 Subject: Updated to Rails 7.0.3 --- app/assets/config/pokeviewer_manifest.js | 1 + app/controllers/pokeviewer/pokemon_controller.rb | 2 +- app/views/pokeviewer/pokemon/embed.html.haml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app') 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 @@ //= link_directory ../javascripts/pokeviewer .js //= link_directory ../stylesheets/pokeviewer .css +//= 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 before_action :load_pokemon, only: [:show, :embed] def index - pokemon = Pokemon.order("trainer_id IS NULL DESC"). + pokemon = Pokemon.order(Arel.sql("trainer_id IS NULL DESC")). order(trainer_id: :asc). order(box: :asc). 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 @@ %li.ptabe-button.ptabe-moves= link_to "Moves", "\#", data: {tab: "moves"} %li.ptabe-button.ptabe-contest= link_to "Contest", "\#", data: {tab: "contest"} %li.ptabe-button.ptabe-ribbons= link_to "Ribbons", "\#", data: {tab: "ribbons"} - = render @pokemon + = render @revision -- cgit 1.4.1