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

Dropdown on details page allows image management for users and admins

Browse source
This commit is contained in:
Christoph Haas 2016-04-07 17:01:00 +02:00
parent 263f6cd33f
commit 16999260ca
8 changed files with 75 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/models/package.rb
View file

@ -36,15 +36,4 @@ class Package < ActiveRecord::Base
def self.screenshots_approved
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

8
app/models/screenshot.rb
View file

@ -20,10 +20,14 @@ class Screenshot < ActiveRecord::Base
# Currently this check makes sure that the same screenshot is not uploaded
# twice for the same package. However it allows the screenshot to be uploaded
# for two different packages. Restricting that further may happen later.
# TODO: will fail if screenshot is updated because it finds its own image
def validate_image_is_unique
# Look for images with the same checksum / image_fingerprint
if Screenshot.find_by(image_fingerprint: image_fingerprint, package_id: self.package.id)
errors.add(:image, "has already been uploaded for this package")
if screenshot=Screenshot.find_by(image_fingerprint: image_fingerprint, package_id: self.package.id)
unless screenshot.id == self.id
errors.add(:image, "has already been uploaded for this package")
end
end
end