IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Include pending queued users regardless of their score (#9372)

Browse Source
This commit is contained in:
Roman Rizzi 2020-04-07 11:42:12 -03:00 committed by GitHub
parent 3e176f9bf4
commit e52e7f6e75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/reviewable.rb
View File

@ -476,7 +476,10 @@ class Reviewable < ActiveRecord::Base
result = result.where("created_at <= ?", to_date) if to_date
if min_score > 0 && status == :pending && type.nil?
result = result.where("score >= ? OR type = ?", min_score, ReviewableQueuedPost.name)
result = result.where(
"score >= ? OR type IN (?)",
min_score, [ReviewableQueuedPost.name, ReviewableUser.name]
)
elsif min_score > 0
result = result.where("score >= ?", min_score)
end

3
spec/models/reviewable_spec.rb
View File

@ -181,10 +181,11 @@ RSpec.describe Reviewable, type: :model do
SiteSetting.reviewable_default_visibility = :high
Reviewable.set_priorities(high: 10)
@queued_post = Fabricate(:reviewable_queued_post, score: 0, target: post)
@queued_user = Fabricate(:reviewable_user, score: 0)
end
it 'includes queued posts when searching for pending reviewables' do
expect(Reviewable.list_for(user)).to contain_exactly(@queued_post)
expect(Reviewable.list_for(user)).to contain_exactly(@queued_post, @queued_user)
end
it 'excludes pending queued posts when applying a different status filter' do