about summary refs log tree commit diff
path: root/app/views/admin
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2017-11-28 23:41:02 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-11-28 15:41:02 +0100
commit15fab79cfa5b732e9d7816f162272d72cf06c733 (patch)
treeb98ae3561675f5cfc4af08f8d2e7fe338aecefbd /app/views/admin
parenteeaec39888f66bf312ac9a4c58f315ffd8f874f2 (diff)
Show "expired" in invite index (#5838)
* Show "expired" in invite index

* "Force expire" -> "Deactivate"
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/invites/_invite.html.haml10
1 files changed, 7 insertions, 3 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?