diff options
| author | Reverite <github@reverite.sh> | 2019-03-21 15:35:55 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-03-21 15:35:55 -0700 |
| commit | 592735fd80acd0aeffb5a5674255ed48d7a8db0b (patch) | |
| tree | 0eefc67f624a07df0af860edecd68d5dc64c7ee9 /app/views/admin/invites | |
| parent | 75eeb003b09c53d3b4e98046d1c20b0ad8a887bb (diff) | |
| parent | bde9196b70299405ebe9b16500b7a3f65539b2c3 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/views/admin/invites')
| -rw-r--r-- | app/views/admin/invites/_invite.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml index ee0eacaf5..e6ad9de34 100644 --- a/app/views/admin/invites/_invite.html.haml +++ b/app/views/admin/invites/_invite.html.haml @@ -10,10 +10,7 @@ = image_tag invite.user.account.avatar.url(:original), alt: '', width: 16, height: 16, class: 'avatar' %span.username= invite.user.account.username - - if invite.expired? - %td{ colspan: 2 } - = t('invites.expired') - - else + - if invite.valid_for_use? %td = fa_icon 'user fw' = invite.uses @@ -24,6 +21,10 @@ - else %time.formatted{ datetime: invite.expires_at.iso8601, title: l(invite.expires_at) } = l invite.expires_at + - else + %td{ colspan: 2 } + = t('invites.expired') + %td - - if !invite.expired? && policy(invite).destroy? + - if invite.valid_for_use? && policy(invite).destroy? = table_link_to 'times', t('invites.delete'), admin_invite_path(invite), method: :delete |