From d0d9977cc236ed16afc2f16718fda9394af1c457 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 18 May 2016 18:40:07 +0200 Subject: [PATCH] Search for both unapproved and markedfordelete screenshots --- app/controllers/moderate_controller.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/controllers/moderate_controller.rb b/app/controllers/moderate_controller.rb index 72e429a..a0de33c 100644 --- a/app/controllers/moderate_controller.rb +++ b/app/controllers/moderate_controller.rb @@ -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