Fix handling of user session and user-uploaded images

This commit is contained in:
Christoph Haas 2020-08-17 01:49:20 +02:00
parent b70a9f1a07
commit eb8f27d9e6
2 changed files with 9 additions and 16 deletions

View file

@ -7,12 +7,14 @@ module PackagesHelper
# - all screenshots if the user is an admin
def screenshots_visible_to_user(package)
if user_signed_in? and current_user.is_admin?
# User is an admin
# User is an admin and can view all screenshots
package.screenshots
elsif user_signed_in?
package.screenshots.where(id: (current_user.screenshots.select(:id))) | \
package.screenshots.where(approved: true).order('created_at DESC')
# TODO: User logins and assigned screenshots will come in a later version
# elsif user_signed_in?
# package.screenshots.where(id: (current_user.screenshots.select(:id))) | \
# package.screenshots.where(approved: true).order('created_at DESC')
else
package.screenshots.where(uploaderhash: session.id.to_s) | \
package.screenshots.where(approved: true).order('created_at DESC')
end
end