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

Default scope sucks, fix ordering for cards

Browse source
This commit is contained in:
Andrew Tomaka 2015-11-04 11:56:26 -05:00
parent 2f2e4b2381
commit 803837fdb3
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/cards_controller.rb
View file

@ -4,7 +4,7 @@ class Api::V1::CardsController < Api::V1::BaseController
@cards = Card.includes(:character, :rarity, :type, :leader_skill, @cards = Card.includes(:character, :rarity, :type, :leader_skill,
:passive_skill, :super_attack, :awaken_type, :passive_skill, :super_attack, :awaken_type,
:dokkan_card, :hp_stat, :atk_stat, :def_stat, :dokkan_card, :hp_stat, :atk_stat, :def_stat,
:links) :links).all.order(:gameid)
render json: @cards, root: false render json: @cards, root: false
end end

2
app/models/card.rb
View file

@ -35,8 +35,6 @@ class Card < ActiveRecord::Base
validates :type, presence: true validates :type, presence: true
validates :awaken_type, presence: true validates :awaken_type, presence: true
default_scope { order(:gameid) }
scope :new_this_week, -> { where('created_at > ?', 1.week.ago) } scope :new_this_week, -> { where('created_at > ?', 1.week.ago) }
def dokkan? def dokkan?

2
app/views/admin/cards/index.html.slim
View file

@ -11,12 +11,14 @@
tr tr
th Name th Name
th Title th Title
th Updated
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 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)