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

Add type and rarity to card index



See merge request !27

app/controllers/admin/cards_controller.rb

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

app/views/admin/cards/index.html.slim

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