Skip to content

Commit 8db8a3b

Browse files
authored
Improve admin user view page (#33735)
1. show more user types 2. show prohibited state
1 parent 0e477b5 commit 8db8a3b

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

templates/admin/user/view_details.tmpl

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,25 @@
99
{{if .User.IsAdmin}}
1010
<span class="ui basic label">{{ctx.Locale.Tr "admin.users.admin"}}</span>
1111
{{end}}
12+
{{if .User.IsTypeBot}}
13+
<span class="ui basic label">{{ctx.Locale.Tr "admin.users.bot"}}</span>
14+
{{end}}
1215
</div>
1316
<div class="flex-item-body">
1417
<b>{{ctx.Locale.Tr "admin.users.auth_source"}}:</b>
15-
{{if eq .LoginSource.ID 0}}
16-
{{ctx.Locale.Tr "admin.users.local"}}
17-
{{else}}
18-
{{.LoginSource.Name}}
19-
{{end}}
18+
{{Iif (eq .LoginSource.ID 0) (ctx.Locale.Tr "admin.users.local") .LoginSource.Name}}
2019
</div>
2120
<div class="flex-item-body">
2221
<b>{{ctx.Locale.Tr "admin.users.activated"}}:</b>
23-
{{if .User.IsActive}}
24-
{{svg "octicon-check"}}
25-
{{else}}
26-
{{svg "octicon-x"}}
27-
{{end}}
22+
{{svg (Iif .User.IsActive "octicon-check" "octicon-x")}}
23+
</div>
24+
<div class="flex-item-body">
25+
<b>{{ctx.Locale.Tr "admin.users.prohibit_login"}}:</b>
26+
{{svg (Iif .User.ProhibitLogin "octicon-check" "octicon-x")}}
2827
</div>
2928
<div class="flex-item-body">
3029
<b>{{ctx.Locale.Tr "admin.users.restricted"}}:</b>
31-
{{if .User.IsRestricted}}
32-
{{svg "octicon-check"}}
33-
{{else}}
34-
{{svg "octicon-x"}}
35-
{{end}}
30+
{{svg (Iif .User.IsRestricted "octicon-check" "octicon-x")}}
3631
</div>
3732
<div class="flex-item-body">
3833
<b>{{ctx.Locale.Tr "settings.visibility"}}:</b>
@@ -42,11 +37,7 @@
4237
</div>
4338
<div class="flex-item-body">
4439
<b>{{ctx.Locale.Tr "admin.users.2fa"}}:</b>
45-
{{if .TwoFactorEnabled}}
46-
<span class="text green">{{svg "octicon-check"}}</span>
47-
{{else}}
48-
{{svg "octicon-x"}}
49-
{{end}}
40+
{{svg (Iif .TwoFactorEnabled "octicon-check" "octicon-x")}}
5041
</div>
5142
{{if .User.Language}}
5243
<div class="flex-item-body">

templates/admin/user/view_emails.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="flex-item">
44
<div class="flex-item-main">
55
<div class="flex-text-block">
6-
{{.Email}}
6+
<a href="mailto:{{.Email}}">{{.Email}}</a>
77
{{if .IsPrimary}}
88
<div class="ui primary label">{{ctx.Locale.Tr "settings.primary"}}</div>
99
{{end}}

0 commit comments

Comments
 (0)