Added approval pending screenshots to moderation view
This commit is contained in:
parent
07fb00d9f0
commit
a992181cec
1 changed files with 18 additions and 8 deletions
|
|
@ -5,20 +5,30 @@ class ModerateController < ApplicationController
|
||||||
def index
|
def index
|
||||||
# List of screenshots to be moderated
|
# List of screenshots to be moderated
|
||||||
@pending_screenshots = Screenshot.where(approved: false)
|
@pending_screenshots = Screenshot.where(approved: false)
|
||||||
# List of packages with pending screenshots
|
# First package with pending screenshots
|
||||||
@pending_packages = Package.joins(:screenshots).where('screenshots.approved=false').distinct(:name)
|
@pending_package = Package.joins(:screenshots).where('screenshots.approved=false').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…
|
# The next package that has pending screenshots…
|
||||||
@package = @pending_packages.first
|
@package = @pending_package or @reported_package
|
||||||
# Number of screenshots that were already moderated (during this session)
|
|
||||||
session[:already_moderated] ||= 0
|
if @package
|
||||||
@moderated_screenshots = session[:already_moderated]
|
# Number of screenshots that were already moderated (during this session)
|
||||||
# Percentage of already moderated screenshots
|
session[:already_moderated] ||= 0
|
||||||
@percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count)
|
@moderated_screenshots = session[:already_moderated]
|
||||||
|
# Percentage of already moderated screenshots
|
||||||
|
@percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count + @reported_screenshots.count)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Publish a screenshot from the moderation queue
|
# Publish a screenshot from the moderation queue
|
||||||
def approve_screenshot
|
def approve_screenshot
|
||||||
@screenshot = Screenshot.find(params[:id])
|
@screenshot = Screenshot.find(params[:id])
|
||||||
|
# TODO: Move code to model
|
||||||
@screenshot.delete_reason = nil
|
@screenshot.delete_reason = nil
|
||||||
@screenshot.markedfordelete = false
|
@screenshot.markedfordelete = false
|
||||||
@screenshot.approved = true
|
@screenshot.approved = true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue