From 427cdf87d782fd6cc47a0ea204fa60bddbe4c3ff Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 23 Nov 2020 00:21:17 +0100 Subject: [PATCH] Moved Screenshot.adminstatus to status_text helper This change allows the use of fa_icon helpers --- app/helpers/packages_helper.rb | 12 ++++++++++++ app/models/screenshot.rb | 18 +++++++++--------- app/views/packages/details.slim | 3 +-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/helpers/packages_helper.rb b/app/helpers/packages_helper.rb index 66e4a09..14b425f 100644 --- a/app/helpers/packages_helper.rb +++ b/app/helpers/packages_helper.rb @@ -58,4 +58,16 @@ module PackagesHelper # empty_stars = fa_icon('star-o') * (5-rating) # (filled_stars+empty_stars).html_safe # end + + def status_text(screenshot) + # TODO: markedfordelete/reporting will be removed + if screenshot.markedfordelete + "Removal requested > #{screenshot.delete_reason}" + elsif screenshot.approved + fa_icon('check-square') + ' Public' + else + fa_icon('hourglass') + ' Waiting for approval' + end + end + end diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index 857ac0a..c8189b8 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -71,15 +71,15 @@ class Screenshot < ApplicationRecord end # Brief text describing the status of this screenshots (for admins) - def adminstatus - if self.markedfordelete - "Removal requested > #{self.delete_reason}" - elsif self.approved - 'Public' - else - 'Waiting for approval' - end - end + # def adminstatus + # if self.markedfordelete + # "Removal requested > #{self.delete_reason}" + # elsif self.approved + # 'Public' + # else + # fa_icon('hourglass') + 'Waiting for approval' + # end + # end # Publish a screenshot from the moderation queue def approve! diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 094811c..ea70138 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -34,8 +34,7 @@ hr .text span.label.secondary - ' Status: - = screenshot.adminstatus + = status_text(screenshot) = render(partial: 'admin_buttons', locals: {screenshot: screenshot}) / - elsif user_signed_in? and screenshot.user == current_user