atomaka
/
dokkan-data-rails
1
0
Fork 0
Code Releases Activity

Merge branch 'atomaka/feature/type-on-card-index' into 'master' 

Add type and rarity to card index



See merge request !27
This commit is contained in:
Andrew Tomaka 2015-11-09 12:50:37 -05:00
parent c16b1dcb4f 6f3957a0b2
commit 97bf360353
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/admin/cards_controller.rb
View File

@ -3,7 +3,10 @@ class Admin::CardsController < Admin::BaseController
after_action :verify_authorized after_action :verify_authorized
def index def index
@cards = Card.includes(:character).all.order(updated_at: :desc) @cards = Card
.includes(:character, :type, :rarity)
.all
.order(updated_at: :desc)
authorize Card authorize Card
end end

6
app/views/admin/cards/index.html.slim
View File

@ -11,14 +11,16 @@
tr tr
th Name th Name
th Title th Title
th Updated th Type
th Rarity
th Actions th Actions
tbody tbody
- @cards.each do |card| - @cards.each do |card|
tr tr
td= card.name td= card.name
td= card.title td= card.title
td= card.updated_at td= card.type.name
td= card.rarity.name
td td
- if policy(:card).edit? - if policy(:card).edit?
= link_to glyph('edit', classes: 'control-icon'), edit_admin_card_path(card) = link_to glyph('edit', classes: 'control-icon'), edit_admin_card_path(card)