Search for both unapproved and markedfordelete screenshots
This commit is contained in:
parent
a9ee2ab79d
commit
d0d9977cc2
1 changed files with 10 additions and 8 deletions
|
|
@ -6,22 +6,24 @@ class ModerateController < ApplicationController
|
|||
# List of screenshots to be moderated
|
||||
@pending_screenshots = Screenshot.where(approved: false)
|
||||
# First package with pending screenshots
|
||||
@pending_package = Package.joins(:screenshots).where('screenshots.approved=false').distinct(:name).first
|
||||
@pending_package = Package.joins(:screenshots).where('screenshots.approved=false or screenshots.markedfordelete=true').distinct(:name).first
|
||||
|
||||
# List of screenshots that were reported (to be removed)
|
||||
@reported_screenshots = Screenshot.where(markedfordelete: true)
|
||||
# First package with reported screenshots
|
||||
@reported_package = Package.joins(:screenshots).where('screenshots.markedfordelete=true').distinct(:name).first
|
||||
# # List of screenshots that were reported (to be removed)
|
||||
# @reported_screenshots = Screenshot.where(markedfordelete: true)
|
||||
# # First package with reported screenshots
|
||||
# @reported_package = Package.joins(:screenshots).where('screenshots.markedfordelete=true').distinct(:name).first
|
||||
|
||||
# The next package that has pending screenshots…
|
||||
@package = @pending_package or @reported_package
|
||||
# # The next package that has pending screenshots…
|
||||
# @package = @pending_package or @reported_package
|
||||
@package = @pending_package
|
||||
|
||||
if @package
|
||||
# Number of screenshots that were already moderated (during this session)
|
||||
session[:already_moderated] ||= 0
|
||||
@moderated_screenshots = session[:already_moderated]
|
||||
# Percentage of already moderated screenshots
|
||||
@percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count + @reported_screenshots.count)
|
||||
@percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count)
|
||||
# @percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count + @reported_screenshots.count)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue