diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-16 17:10:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 17:10:27 +0100 |
| commit | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (patch) | |
| tree | 97325ab7ad5a572170637da7a72ba72b7231a02f /app/views/invites | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
| parent | 0fbe90e2d3cfc2c5d1fd12ea564daa52a83ec0ac (diff) | |
Merge pull request #961 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/invites')
| -rw-r--r-- | app/views/invites/_invite.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
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 |