1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/pokeviewer/pokemon/index.html.haml b/app/views/pokeviewer/pokemon/index.html.haml
index 0be3edd..e1793dc 100644
--- a/app/views/pokeviewer/pokemon/index.html.haml
+++ b/app/views/pokeviewer/pokemon/index.html.haml

@@ -1,4 +1,4 @@
- @trainers.each do |trainer|
+- @trainers.each do |trainer, party, boxes|
  .trainer
    .trainer-info{ class: trainer.game }
      %h2= trainer.name
@@ -6,11 +6,11 @@
    .pc-boxes
      %ul.party.pc-box
        %h3 Party
-        - trainer.party.each do |p|
+        - party.each do |p|
          %li
            %span.party-icon= image_tag p.icon_path
-            %span.party-name= link_to p.revisions.last.nickname, p
+            %span.party-name= link_to p.nickname, p
-      - trainer.boxes.each do |box|
+      - boxes.each do |box|
        .pc-box
          %h3= box[:name]
          %table.pc-contents
@@ -23,7 +23,7 @@
                    - else
                      = link_to image_tag(p.icon_path), p
                      .pc-data.pkv-hover
-                        .pc-data-name= p.revisions.last.nickname
+                        .pc-data-name= p.nickname
                        .pc-data-ot
                          OT/
                          %span{ class: p.ot_gender }>= p.ot_name
@@ -36,7 +36,7 @@
        %li.pc-pokemon.pkv-has-hover
          = link_to image_tag(p.icon_path), p
          .pc-data.pkv-hover
-            .pc-data-name= p.revisions.last.nickname
+            .pc-data-name= p.nickname
            .pc-data-ot
              OT/
              %span{ class: p.ot_gender }>= p.ot_name

diff --git a/app/views/pokeviewer/pokemon/index.html.haml b/app/views/pokeviewer/pokemon/index.html.haml index 0be3edd..e1793dc 100644 --- a/app/views/pokeviewer/pokemon/index.html.haml +++ b/app/views/pokeviewer/pokemon/index.html.haml
@@ -1,4 +1,4 @@
1	- @trainers.each do \|trainer\|	1	- @trainers.each do \|trainer, party, boxes\|
2	.trainer	2	.trainer
3	.trainer-info{ class: trainer.game }	3	.trainer-info{ class: trainer.game }
4	%h2= trainer.name	4	%h2= trainer.name
@@ -6,11 +6,11 @@
6	.pc-boxes	6	.pc-boxes
7	%ul.party.pc-box	7	%ul.party.pc-box
8	%h3 Party	8	%h3 Party
9	- trainer.party.each do \|p\|	9	- party.each do \|p\|
10	%li	10	%li
11	%span.party-icon= image_tag p.icon_path	11	%span.party-icon= image_tag p.icon_path
12	%span.party-name= link_to p.revisions.last.nickname, p	12	%span.party-name= link_to p.nickname, p
13	- trainer.boxes.each do \|box\|	13	- boxes.each do \|box\|
14	.pc-box	14	.pc-box
15	%h3= box[:name]	15	%h3= box[:name]
16	%table.pc-contents	16	%table.pc-contents
@@ -23,7 +23,7 @@
23	- else	23	- else
24	= link_to image_tag(p.icon_path), p	24	= link_to image_tag(p.icon_path), p
25	.pc-data.pkv-hover	25	.pc-data.pkv-hover
26	.pc-data-name= p.revisions.last.nickname	26	.pc-data-name= p.nickname
27	.pc-data-ot	27	.pc-data-ot
28	OT/	28	OT/
29	%span{ class: p.ot_gender }>= p.ot_name	29	%span{ class: p.ot_gender }>= p.ot_name
@@ -36,7 +36,7 @@
36	%li.pc-pokemon.pkv-has-hover	36	%li.pc-pokemon.pkv-has-hover
37	= link_to image_tag(p.icon_path), p	37	= link_to image_tag(p.icon_path), p
38	.pc-data.pkv-hover	38	.pc-data.pkv-hover
39	.pc-data-name= p.revisions.last.nickname	39	.pc-data-name= p.nickname
40	.pc-data-ot	40	.pc-data-ot
41	OT/	41	OT/
42	%span{ class: p.ot_gender }>= p.ot_name	42	%span{ class: p.ot_gender }>= p.ot_name