diff --git a/app/models/ability.rb b/app/models/ability.rb index 1fe10c7..1231449 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -43,8 +43,8 @@ class Ability if user.admin_role? can :approve, Screenshot can :destroy, Screenshot - can :hide, Screenshot, approved: true, hidden: false - can :unhide, Screenshot, approved: true, hidden: true + can :hide, Screenshot + can :unhide, Screenshot can :destroy, User can :view, Screenshot can :destroy, Package @@ -52,8 +52,8 @@ class Ability end if user.moderator_role? can :approve, Screenshot - can :hide, Screenshot, approved: true, hidden: false - can :unhide, Screenshot, approved: true, hidden: true + can :hide, Screenshot + can :unhide, Screenshot can :view, Screenshot end end diff --git a/app/views/packages/_admin_buttons.slim b/app/views/packages/_admin_buttons.slim index dea334c..76f6a79 100644 --- a/app/views/packages/_admin_buttons.slim +++ b/app/views/packages/_admin_buttons.slim @@ -7,13 +7,13 @@ span class="label adminlabel #{@statuscolor}" = @statustext - - if can?(:hide, screenshot) + - if !screenshot.hidden && screenshot.approved && can?(:hide, screenshot) a.button.small.bordered.radius.warning[ href=hide_screenshot_path(screenshot.id) onclick="return confirm('Really hide the screenshot from public view?');" ] #{fa_icon 'eye-slash'} Hide - - if can?(:unhide, screenshot) + - if screenshot.hidden && screenshot.approved && can?(:unhide, screenshot) a.button.small.bordered.radius.warning[ href=unhide_screenshot_path(screenshot.id) ] #{fa_icon 'eye'} Un-Hide