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

Authorisation management using CanCanCan added

Browse source
This commit is contained in:
Christoph Haas 2021-02-28 21:36:46 +01:00
parent 51be4a4777
commit 7a3b65fe50
24 changed files with 211 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

41
app/controllers/moderate_controller.rb
View file

@ -1,27 +1,22 @@
class ModerateController < ApplicationController
# class ModerateController < ApplicationController
before_action :authenticate_user!
# before_action :authenticate_user!
def index
# First package with pending screenshots
@package = Package.joins(:screenshots).where('screenshots.approved=false or screenshots.markedfordelete=true').distinct(:name).first
# def index
# # First package with pending screenshots
# @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
# 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]
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]
# BUG: calculation is wrong when pending and reported screenshots are in the queue
# Percentage of already moderated screenshots
@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
end
# # BUG: calculation is wrong when pending and reported screenshots are in the queue
# # Percentage of already moderated screenshots
# @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
# end