From e46f2a3dff4b40ca6597abd6d9c771abbb3f83d3 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 13 Jun 2016 17:55:38 +0200 Subject: [PATCH] Fixed query for screenshots to be moderated (fixes division by zero) --- app/controllers/moderate_controller.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/controllers/moderate_controller.rb b/app/controllers/moderate_controller.rb index 2465913..5d47b1c 100644 --- a/app/controllers/moderate_controller.rb +++ b/app/controllers/moderate_controller.rb @@ -3,21 +3,17 @@ class ModerateController < ApplicationController before_action :authenticate_user! def index - # 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 or screenshots.markedfordelete=true').distinct(:name).first + @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 - # # The next package that has pending screenshots… - # @package = @pending_package or @reported_package - @package = @pending_package - if @package + # List of screenshots to be moderated + @pending_screenshots = @package.screenshots_pending # Number of screenshots that were already moderated (during this session) session[:already_moderated] ||= 0 @moderated_screenshots = session[:already_moderated]