diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index bdb40be8c..21b6f0dbd 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -10,7 +10,7 @@ class CardsController < ApplicationController def index @considering = page_and_filter_for @filter.with(engagement_status: "considering"), per_page: PAGE_SIZE - @doing = page_and_filter_for @filter.with(engagement_status: "doing"), cards: @filter.cards.golden_first, per_page: PAGE_SIZE + @doing = page_and_filter_for @filter.with(engagement_status: "doing"), cards: @filter.cards.with_golden_first, per_page: PAGE_SIZE @closed = page_and_filter_for @filter.with(indexed_by: "closed"), per_page: PAGE_SIZE end diff --git a/app/models/card/golden.rb b/app/models/card/golden.rb index b3206e248..c8553f6be 100644 --- a/app/models/card/golden.rb +++ b/app/models/card/golden.rb @@ -6,7 +6,7 @@ module Card::Golden has_one :goldness, dependent: :destroy, class_name: "Card::Goldness" - scope :golden_first, -> do + scope :with_golden_first, -> do left_outer_joins(:goldness).tap do |relation| relation.order_values.unshift("card_goldnesses.id IS NULL") end