chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixed query for screenshots to be moderated (fixes division by zero)

Browse source
This commit is contained in:
Christoph Haas 2016-06-13 17:55:38 +02:00
parent bd3167b699
commit e46f2a3dff
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/moderate_controller.rb
View file

@ -3,21 +3,17 @@ class ModerateController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
def index def index
# List of screenshots to be moderated
@pending_screenshots = Screenshot.where(approved: false)
# First package with pending screenshots # 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) # # List of screenshots that were reported (to be removed)
# @reported_screenshots = Screenshot.where(markedfordelete: true) # @reported_screenshots = Screenshot.where(markedfordelete: true)
# # First package with reported screenshots # # First package with reported screenshots
# @reported_package = Package.joins(:screenshots).where('screenshots.markedfordelete=true').distinct(:name).first # @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 if @package
# List of screenshots to be moderated
@pending_screenshots = @package.screenshots_pending
# Number of screenshots that were already moderated (during this session) # Number of screenshots that were already moderated (during this session)
session[:already_moderated] ||= 0 session[:already_moderated] ||= 0
@moderated_screenshots = session[:already_moderated] @moderated_screenshots = session[:already_moderated]