diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-28 11:45:13 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-28 11:45:13 -0600 |
| commit | 95c270f5b1ffd328345a7b1223f65876f3d88423 (patch) | |
| tree | 621e27e89b238d8806fdd3294009361d0691f49c /app/views | |
| parent | 7463d80ff442833a4ad299460f37c27be9b8cda1 (diff) | |
| parent | 15fab79cfa5b732e9d7816f162272d72cf06c733 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/invites/_invite.html.haml | 10 | ||||
| -rw-r--r-- | app/views/invites/_invite.html.haml | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml index 81edfd912..9555a8976 100644 --- a/app/views/admin/invites/_invite.html.haml +++ b/app/views/admin/invites/_invite.html.haml @@ -7,9 +7,13 @@ = invite.uses = " / #{invite.max_uses}" unless invite.max_uses.nil? %td - - if invite.expires_at.nil? - ∞ + - if invite.expired? + = t('invites.expired') - else - = l invite.expires_at + - if invite.expires_at.nil? + ∞ + - else + %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? diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml index d794d72e4..3f5f7936c 100644 --- a/app/views/invites/_invite.html.haml +++ b/app/views/invites/_invite.html.haml @@ -3,9 +3,13 @@ = invite.uses = " / #{invite.max_uses}" unless invite.max_uses.nil? %td - - if invite.expires_at.nil? - ∞ + - if invite.expired? + = t('invites.expired') - else - = l invite.expires_at + - if invite.expires_at.nil? + ∞ + - else + %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? |