Skip to content

Commit dcb543a

Browse files
authored
Show 2FA info on Admin Pannel: Users List (#12515)
1 parent a5440fc commit dcb543a

4 files changed

Lines changed: 5 additions & 1 deletion

File tree

options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,6 +1982,7 @@ users.full_name = Full Name
19821982
users.activated = Activated
19831983
users.admin = Admin
19841984
users.restricted = Restricted
1985+
users.2fa = 2FA
19851986
users.repos = Repos
19861987
users.created = Created
19871988
users.last_login = Last Sign-In

routers/home.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ func RenderUserSearch(ctx *context.Context, opts *models.SearchUserOptions, tplN
233233
ctx.Data["Keyword"] = opts.Keyword
234234
ctx.Data["Total"] = count
235235
ctx.Data["Users"] = users
236+
ctx.Data["UsersTwoFaStatus"] = models.UserList(users).GetTwoFaStatus()
236237
ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail
237238
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
238239

templates/admin/user/list.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<th>{{.i18n.Tr "admin.users.activated"}}</th>
2626
<th>{{.i18n.Tr "admin.users.admin"}}</th>
2727
<th>{{.i18n.Tr "admin.users.restricted"}}</th>
28+
<th>{{.i18n.Tr "admin.users.2fa"}}</th>
2829
<th>{{.i18n.Tr "admin.users.repos"}}</th>
2930
<th>{{.i18n.Tr "admin.users.created"}}</th>
3031
<th data-sortt-asc="recentupdate" data-sortt-desc="leastupdate">
@@ -43,6 +44,7 @@
4344
<td><i class="fa fa{{if .IsActive}}-check{{end}}-square-o"></i></td>
4445
<td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td>
4546
<td><i class="fa fa{{if .IsRestricted}}-check{{end}}-square-o"></i></td>
47+
<td><i class="fa fa{{if index $.UsersTwoFaStatus .ID}}-check{{end}}-square-o"></i></td>
4648
<td>{{.NumRepos}}</td>
4749
<td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td>
4850
{{if .LastLoginUnix}}

templates/org/member/members.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</div>
4040
<div class="ui one wide column center">
4141
<div class="meta">
42-
2FA
42+
{{$.i18n.Tr "admin.users.2fa"}}
4343
</div>
4444
<div class="meta">
4545
<strong>

0 commit comments

Comments
 (0)