From 6eb60260b1b771e8cd42d3b58b82b2781a067991 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 22 Dec 2017 02:14:17 +0100
Subject: [PATCH] =?UTF-8?q?Display=20deleted=20users'=20role=20as=20?=
=?UTF-8?q?=E2=80=9CSuspended=E2=80=9D=20(#6080)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Deleted users are technically suspended, but the code displaying their status
in the admin interface was broken and displayed a javascript object holding
translations of the possible user roles instead.
---
app/views/admin/accounts/_account.html.haml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index 598f6cddd0..dfa7c56491 100644
--- 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
--
GitLab