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

Avoid displaying unapproved screenshots in Any view

Browse source
This commit is contained in:
Christoph Haas 2021-03-01 01:23:52 +01:00
parent ce9e1d8877
commit 7227f769c0
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/packages_controller.rb
View file

@ -288,7 +288,7 @@ class PackagesController < ApplicationController
# Return packages matching the criteria given by parameters # Return packages matching the criteria given by parameters
def query_packages def query_packages
# Eager load the screenshots to avoid N+1 queries to check Screenshot.accessibly_by later # Eager load the screenshots to avoid N+1 queries to check Screenshot.accessible_by later
packages = Package.includes(:screenshots).order(visits: :desc) packages = Package.includes(:screenshots).order(visits: :desc)
# text search # text search
@ -305,6 +305,10 @@ class PackagesController < ApplicationController
when 'without' when 'without'
packages = packages.without_screenshots packages = packages.without_screenshots
logger.debug 'Limiting packages to those without screenshots' logger.debug 'Limiting packages to those without screenshots'
else
packages = packages.where(screenshots: Screenshot.accessible_by(current_ability, :view)).or(
packages.without_screenshots)
end end
return packages return packages

2
app/views/packages/details.slim
View file

@ -11,7 +11,7 @@
.small-7.medium-7.cell .small-7.medium-7.cell
/ Left column contains images / Left column contains images
- if @screenshots.length > 0 - if @screenshots.any?
= render(partial: 'packages/paginator', locals: {items: @screenshots}) = render(partial: 'packages/paginator', locals: {items: @screenshots})
.grid-x.grid-margin-x.medium-up-1.large-up-2 data-equalizer=true data-equalize-on="medium" .grid-x.grid-margin-x.medium-up-1.large-up-2 data-equalizer=true data-equalize-on="medium"
- @screenshots.each do |screenshot| - @screenshots.each do |screenshot|