diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-24 18:14:24 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-24 18:14:24 -0400 |
| commit | 2721f3768ebd4d279caa967bee210249d93f92cb (patch) | |
| tree | d398e3791dd03134ab3f40d41191abc073a8bad4 /app/controllers | |
| parent | 012b083cbd74ab687d5529258ff045319265e594 (diff) | |
| download | pokeviewer-2721f3768ebd4d279caa967bee210249d93f92cb.tar.gz pokeviewer-2721f3768ebd4d279caa967bee210249d93f92cb.tar.bz2 pokeviewer-2721f3768ebd4d279caa967bee210249d93f92cb.zip | |
Worked on PC display page
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/pokeviewer/pokemon_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
| diff --git a/app/controllers/pokeviewer/pokemon_controller.rb b/app/controllers/pokeviewer/pokemon_controller.rb index aaf6586..ef421ac 100644 --- a/app/controllers/pokeviewer/pokemon_controller.rb +++ b/app/controllers/pokeviewer/pokemon_controller.rb | |||
| @@ -3,7 +3,7 @@ require_dependency "pokeviewer/application_controller" | |||
| 3 | module Pokeviewer | 3 | module Pokeviewer |
| 4 | class PokemonController < ApplicationController | 4 | class PokemonController < ApplicationController |
| 5 | def index | 5 | def index |
| 6 | @pokemon = Pokemon.all | 6 | @trainers = Trainer.all |
| 7 | end | 7 | end |
| 8 | 8 | ||
| 9 | def show | 9 | def show |