diff --git a/app/helpers/packages_helper.rb b/app/helpers/packages_helper.rb index 55c8146..bb6b3e9 100644 --- a/app/helpers/packages_helper.rb +++ b/app/helpers/packages_helper.rb @@ -1,13 +1,2 @@ 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) - def screenshots_visible_to_user - self.screenshots.where( - # "approved=true" - "approved=true OR uploaderhash=?", session[:token] - ) - end - end diff --git a/app/models/package.rb b/app/models/package.rb index a9bb87e..d1a12c0 100644 --- a/app/models/package.rb +++ b/app/models/package.rb @@ -37,4 +37,14 @@ class Package < ActiveRecord::Base self.screenshots.find_by(approved: true) end + # 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) + def screenshots_visible_to_user(token) + self.screenshots.where( + # "approved=true" + "approved=true OR uploaderhash=?", token + ) + end end diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 1392ccb..306cb78 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -4,8 +4,8 @@ .small-7.medium-7.columns.packagepage p.subtitle = @package.description - - if @package.screenshots_visible_to_user.count > 0 - - @package.screenshots_visible_to_user.each do |screenshot| + - if @package.screenshots_visible_to_user(session[:token]).count > 0 + - @package.screenshots_visible_to_user(session[:token]).each do |screenshot| .row.listview .small-12.columns .text-center