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

Dammit… I can't remember what I changed and why

Browse source
This commit is contained in:
Christoph Haas 2018-05-06 19:07:41 +02:00
parent 09b0df40f7
commit dd7527691e
20 changed files with 579 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/helpers/packages_helper.rb
View file

@ -3,16 +3,16 @@ module PackagesHelper
# Return a query of all screenshots that the current user may see
# Consists of:
# - approved (public) screenshots
# - screenshots uploaded by the user (determined by cookie session)
# - all screenshots if the user is logged in
# - screenshots uploaded by the user
# - all screenshots if the user is an admin
def screenshots_visible_to_user(package)
if user_signed_in?
if user_signed_in? and current_user.is_admin?
# User is an admin
package.screenshots.order('created_at DESC')
package.screenshots
elsif user_signed_in?
current_user.screenshots
else
package.screenshots.where(
"approved=true OR uploaderhash=?", session[:token]
).order('created_at DESC')
package.screenshots.where(approved: true).order('created_at DESC')
end
end