Default scope sucks, fix ordering for cards
This commit is contained in:
parent
2f2e4b2381
commit
803837fdb3
3 changed files with 3 additions and 3 deletions
|
@ -4,7 +4,7 @@ class Api::V1::CardsController < Api::V1::BaseController
|
|||
@cards = Card.includes(:character, :rarity, :type, :leader_skill,
|
||||
:passive_skill, :super_attack, :awaken_type,
|
||||
:dokkan_card, :hp_stat, :atk_stat, :def_stat,
|
||||
:links)
|
||||
:links).all.order(:gameid)
|
||||
|
||||
render json: @cards, root: false
|
||||
end
|
||||
|
|
|
@ -35,8 +35,6 @@ class Card < ActiveRecord::Base
|
|||
validates :type, presence: true
|
||||
validates :awaken_type, presence: true
|
||||
|
||||
default_scope { order(:gameid) }
|
||||
|
||||
scope :new_this_week, -> { where('created_at > ?', 1.week.ago) }
|
||||
|
||||
def dokkan?
|
||||
|
|
|
@ -11,12 +11,14 @@
|
|||
tr
|
||||
th Name
|
||||
th Title
|
||||
th Updated
|
||||
th Actions
|
||||
tbody
|
||||
- @cards.each do |card|
|
||||
tr
|
||||
td= card.name
|
||||
td= card.title
|
||||
td= card.updated_at
|
||||
td
|
||||
- if policy(:card).edit?
|
||||
= link_to glyph('edit', classes: 'control-icon'), edit_admin_card_path(card)
|
||||
|
|
Loading…
Reference in a new issue