diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-15 05:35:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 05:35:17 +0100 |
| commit | ff565524aa6aa35c07557ea02d8d04bb3a9e1a97 (patch) | |
| tree | 0be02fc04e4b120d8153e860bd2eb33dd7623c1c /app/views | |
| parent | 1b167707c2ae5ebc272afc3a7515f5b236083135 (diff) | |
Fix maxed-out invites not showing up as expired in UI (#10274)
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/invites/_invite.html.haml | 11 | ||||
| -rw-r--r-- | app/views/invites/_invite.html.haml | 10 |
2 files changed, 11 insertions, 10 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 diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml index 4240aa3e7..62799ca5b 100644 --- a/app/views/invites/_invite.html.haml +++ b/app/views/invites/_invite.html.haml @@ -5,10 +5,7 @@ %input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: public_invite_url(invite_code: invite.code) } %button{ type: :button }= t('generic.copy') - - if invite.expired? - %td{ colspan: 2 } - = t('invites.expired') - - else + - if invite.valid_for_use? %td = fa_icon 'user fw' = invite.uses @@ -19,7 +16,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'), invite_path(invite), method: :delete |