diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-12-01 20:26:19 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-01 12:26:19 +0100 |
| commit | df03042a6ed84aad7ea21e683aa56726466a7790 (patch) | |
| tree | d6d37f340fa41a19d443de7e9d904db30324fa18 | |
| parent | 9927df83add34bcdb339c9be5a51b92fe0959377 (diff) | |
Allow admin to deactivate invite created by users (#5860)
| -rw-r--r-- | app/policies/invite_policy.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/invites/_invite.html.haml | 4 | ||||
| -rw-r--r-- | app/views/invites/_invite.html.haml | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/policies/invite_policy.rb b/app/policies/invite_policy.rb index e5c68af19..a2a65f934 100644 --- a/app/policies/invite_policy.rb +++ b/app/policies/invite_policy.rb @@ -10,7 +10,7 @@ class InvitePolicy < ApplicationPolicy end def destroy? - owner? || staff? + owner? || (Setting.min_invite_role == 'admin' ? admin? : staff?) end private diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml index 9555a8976..d7b697286 100644 --- a/app/views/admin/invites/_invite.html.haml +++ b/app/views/admin/invites/_invite.html.haml @@ -16,4 +16,6 @@ %time.formatted{ datetime: invite.expires_at.iso8601, title: l(invite.expires_at) } = l invite.expires_at %td= table_link_to 'link', public_invite_url(invite_code: invite.code), public_invite_url(invite_code: invite.code) - %td= table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete if policy(invite).destroy? + %td + - if !invite.expired? && policy(invite).destroy? + = table_link_to 'times', t('invites.delete'), admin_invite_path(invite), method: :delete diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml index 3f5f7936c..81d67eb7d 100644 --- a/app/views/invites/_invite.html.haml +++ b/app/views/invites/_invite.html.haml @@ -12,4 +12,6 @@ %time.formatted{ datetime: invite.expires_at.iso8601, title: l(invite.expires_at) } = l invite.expires_at %td= table_link_to 'link', public_invite_url(invite_code: invite.code), public_invite_url(invite_code: invite.code) - %td= table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete if policy(invite).destroy? + %td + - if invite.expired? && policy(invite).destroy? + = table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete |