Show abilities to hide/unhide properly
This commit is contained in:
parent
a8b6e672c8
commit
cc76ebcc28
2 changed files with 6 additions and 6 deletions
|
|
@ -43,8 +43,8 @@ class Ability
|
||||||
if user.admin_role?
|
if user.admin_role?
|
||||||
can :approve, Screenshot
|
can :approve, Screenshot
|
||||||
can :destroy, Screenshot
|
can :destroy, Screenshot
|
||||||
can :hide, Screenshot, approved: true, hidden: false
|
can :hide, Screenshot
|
||||||
can :unhide, Screenshot, approved: true, hidden: true
|
can :unhide, Screenshot
|
||||||
can :destroy, User
|
can :destroy, User
|
||||||
can :view, Screenshot
|
can :view, Screenshot
|
||||||
can :destroy, Package
|
can :destroy, Package
|
||||||
|
|
@ -52,8 +52,8 @@ class Ability
|
||||||
end
|
end
|
||||||
if user.moderator_role?
|
if user.moderator_role?
|
||||||
can :approve, Screenshot
|
can :approve, Screenshot
|
||||||
can :hide, Screenshot, approved: true, hidden: false
|
can :hide, Screenshot
|
||||||
can :unhide, Screenshot, approved: true, hidden: true
|
can :unhide, Screenshot
|
||||||
can :view, Screenshot
|
can :view, Screenshot
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,13 @@
|
||||||
span class="label adminlabel #{@statuscolor}"
|
span class="label adminlabel #{@statuscolor}"
|
||||||
= @statustext
|
= @statustext
|
||||||
|
|
||||||
- if can?(:hide, screenshot)
|
- if !screenshot.hidden && screenshot.approved && can?(:hide, screenshot)
|
||||||
a.button.small.bordered.radius.warning[
|
a.button.small.bordered.radius.warning[
|
||||||
href=hide_screenshot_path(screenshot.id)
|
href=hide_screenshot_path(screenshot.id)
|
||||||
onclick="return confirm('Really hide the screenshot from public view?');"
|
onclick="return confirm('Really hide the screenshot from public view?');"
|
||||||
] #{fa_icon 'eye-slash'} Hide
|
] #{fa_icon 'eye-slash'} Hide
|
||||||
|
|
||||||
- if can?(:unhide, screenshot)
|
- if screenshot.hidden && screenshot.approved && can?(:unhide, screenshot)
|
||||||
a.button.small.bordered.radius.warning[
|
a.button.small.bordered.radius.warning[
|
||||||
href=unhide_screenshot_path(screenshot.id)
|
href=unhide_screenshot_path(screenshot.id)
|
||||||
] #{fa_icon 'eye'} Un-Hide
|
] #{fa_icon 'eye'} Un-Hide
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue