#8: withdrawn proposals are not shown to reviewers

NYCrb · Dec 9, 2015 · 42d9b5d · 42d9b5d
1 parent 75f7f21
commit 42d9b5d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/reviewer/proposals_controller.rb b/app/controllers/reviewer/proposals_controller.rb
@@ -7,7 +7,7 @@ class Reviewer::ProposalsController < Reviewer::ApplicationController
   def index
     proposal_ids = current_user.proposals.pluck(:id)
 
-    proposals = @event.proposals.includes(:proposal_taggings, :review_taggings,
+    proposals = @event.proposals.not_withdrawn.includes(:proposal_taggings, :review_taggings,
       :ratings, :internal_comments, :public_comments).where.not(id: proposal_ids)
 
     proposals.to_a.sort_by! { |p| [ p.ratings.present? ? 1 : 0, p.created_at ] }

diff --git a/app/models/proposal.rb b/app/models/proposal.rb
@@ -40,6 +40,7 @@ class Proposal < ActiveRecord::Base
   scope :unrated, -> { where('id NOT IN ( SELECT proposal_id FROM ratings )') }
   scope :rated, -> { where('id IN ( SELECT proposal_id FROM ratings )') }
   scope :scheduled, -> { joins(:session) }
+  scope :not_withdrawn, -> {where.not(state: WITHDRAWN)}
   scope :waitlisted, -> { where(state: WAITLISTED) }
   scope :available, -> do
     includes(:session).where(sessions: {proposal_id: nil}, state: ACCEPTED).order(:title)