From dcb543ac2a9cccc16dd161c820a4a002e8a83e82 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 20 Aug 2020 03:53:49 +0200
Subject: [PATCH] Show 2FA info on Admin Pannel: Users List (#12515)

---
 options/locale/locale_en-US.ini   | 1 +
 routers/home.go                   | 1 +
 templates/admin/user/list.tmpl    | 2 ++
 templates/org/member/members.tmpl | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 9727f7d0d1..1cd94a4687 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1982,6 +1982,7 @@ users.full_name = Full Name
 users.activated = Activated
 users.admin = Admin
 users.restricted = Restricted
+users.2fa = 2FA
 users.repos = Repos
 users.created = Created
 users.last_login = Last Sign-In
diff --git a/routers/home.go b/routers/home.go
index ae94207ade..5425670878 100644
--- a/routers/home.go
+++ b/routers/home.go
@@ -233,6 +233,7 @@ func RenderUserSearch(ctx *context.Context, opts *models.SearchUserOptions, tplN
 	ctx.Data["Keyword"] = opts.Keyword
 	ctx.Data["Total"] = count
 	ctx.Data["Users"] = users
+	ctx.Data["UsersTwoFaStatus"] = models.UserList(users).GetTwoFaStatus()
 	ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
 
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 3442d04195..d6dd7d5c03 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -25,6 +25,7 @@
 						<th>{{.i18n.Tr "admin.users.activated"}}</th>
 						<th>{{.i18n.Tr "admin.users.admin"}}</th>
 						<th>{{.i18n.Tr "admin.users.restricted"}}</th>
+						<th>{{.i18n.Tr "admin.users.2fa"}}</th>
 						<th>{{.i18n.Tr "admin.users.repos"}}</th>
 						<th>{{.i18n.Tr "admin.users.created"}}</th>
 						<th data-sortt-asc="recentupdate" data-sortt-desc="leastupdate">
@@ -43,6 +44,7 @@
 							<td><i class="fa fa{{if .IsActive}}-check{{end}}-square-o"></i></td>
 							<td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td>
 							<td><i class="fa fa{{if .IsRestricted}}-check{{end}}-square-o"></i></td>
+							<td><i class="fa fa{{if index $.UsersTwoFaStatus .ID}}-check{{end}}-square-o"></i></td>
 							<td>{{.NumRepos}}</td>
 							<td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td>
 							{{if .LastLoginUnix}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 1a65a02278..1c33c55c5a 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -39,7 +39,7 @@
 					</div>
 					<div class="ui one wide column center">
 						<div class="meta">
-							2FA
+							{{$.i18n.Tr "admin.users.2fa"}}
 						</div>
 						<div class="meta">
 							<strong>