diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index 7378cdd..cbd2d58 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -63,6 +63,7 @@ class Screenshot < ActiveRecord::Base "live/screenshots/approved/#{self.package.name[0]}/#{self.package.name}/#{self.id}_#{size}.png" end + # Long status text for public users def status text = 'This image ' @@ -79,6 +80,17 @@ class Screenshot < ActiveRecord::Base return text end + # Short status text for admins + def adminstatus + if self.markedfordelete + 'Removal requested' + elsif self.approved + 'Public' + else + 'Waiting for approval' + end + end + # Return the number of screenshots that need to be approved def self.unapproved self.where(approved: false) diff --git a/app/views/packages/_admin_dropdown.slim b/app/views/packages/_admin_dropdown.slim index 7516ca8..1babe6e 100644 --- a/app/views/packages/_admin_dropdown.slim +++ b/app/views/packages/_admin_dropdown.slim @@ -13,7 +13,8 @@ onclick="return confirm('Really delete the screenshot?');" ] Delete screenshot - p Status: #{screenshot.status} - p Uploader IP=#{screenshot.uploaderip} - p Uploader Token=#{session[:token]} - p Uploaded #{screenshot.age_days} (#{screenshot.created_at}) + p Status: #{screenshot.adminstatus} + / p Uploader IP=#{screenshot.uploaderip} + / p Uploader Token=#{session[:token]} + / p Uploaded #{screenshot.age_days} (#{screenshot.created_at}) + p Uploaded #{screenshot.age_days} diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 6663f6c..758becc 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -12,6 +12,8 @@ a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) .imgcaption =screenshot.caption + - if user_signed_in? + em.imgcaption =screenshot.adminstatus // Is the user an admin? - if user_signed_in?