Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-22 04:17:14 +00:00
parent 4a7782d5c9 9592b5e31e
commit 6d00ca1c71
4 changed files with 24 additions and 13 deletions
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@ -6,7 +6,10 @@
      = link_to account.domain, admin_accounts_path(by_domain: account.domain)
  %td
    - if account.local?
-      = t("admin.accounts.roles.#{account.user&.role}")
+      - if account.user.nil?
+        = t("admin.accounts.moderation.suspended")
+      - else
+        = t("admin.accounts.roles.#{account.user.role}")
    - else
      = account.protocol.humanize
  %td