Skip to content

Commit d5adeee

Browse files
wxiaoguangwxiaoguang
committed
Admin can filter user list by status
1 parent 7f85610 commit d5adeee

File tree

8 files changed

+171
-14
lines changed

8 files changed

+171
-14
lines changed

‎models/user.go

+37-9
Original file line numberDiff line numberDiff line change
@@ -1588,14 +1588,15 @@ func GetUser(user *User) (bool, error) {
15881588
// SearchUserOptions contains the options for searching
15891589
type SearchUserOptions struct {
15901590
ListOptions
1591-
Keyword string
1592-
Type UserType
1593-
UID int64
1594-
OrderBy SearchOrderBy
1595-
Visible []structs.VisibleType
1596-
Actor *User // The user doing the search
1597-
IsActive util.OptionalBool
1598-
SearchByEmail bool // Search by email as well as username/full name
1591+
Keyword string
1592+
StatusFilterMap map[string]string // Admin can apply advanced search filters
1593+
Type UserType
1594+
UID int64
1595+
OrderBy SearchOrderBy
1596+
Visible []structs.VisibleType
1597+
Actor *User // The user doing the search
1598+
IsActive util.OptionalBool
1599+
SearchByEmail bool // Search by email as well as username/full name
15991600
}
16001601

16011602
func (opts *SearchUserOptions) toConds() builder.Cond {
@@ -1643,8 +1644,35 @@ func (opts *SearchUserOptions) toConds() builder.Cond {
16431644
// Don't forget about self
16441645
accessCond = accessCond.Or(builder.Eq{"id": opts.Actor.ID})
16451646
cond = cond.And(accessCond)
1647+
} else {
1648+
// Admin can apply advanced filters
1649+
for filterKey, filterValue := range opts.StatusFilterMap {
1650+
if filterValue == "" {
1651+
continue
1652+
}
1653+
if filterKey == "is_active" {
1654+
cond = cond.And(builder.Eq{"is_active": filterValue})
1655+
} else if filterKey == "is_admin" {
1656+
cond = cond.And(builder.Eq{"is_admin": filterValue})
1657+
} else if filterKey == "is_restricted" {
1658+
cond = cond.And(builder.Eq{"is_restricted": filterValue})
1659+
} else if filterKey == "is_prohibit_login" {
1660+
cond = cond.And(builder.Eq{"prohibit_login": filterValue})
1661+
} else if filterKey == "is_2fa_enabled" {
1662+
// TODO: bad performance here, maybe there will be a column "is_2fa_enabled" in the future
1663+
var twoFactorCond builder.Cond
1664+
twoFactorBuilder := builder.Select("uid").From("two_factor").Where(builder.And(builder.Expr("two_factor.uid = user.id")))
1665+
if filterValue == "1" {
1666+
twoFactorCond = builder.In("id", twoFactorBuilder)
1667+
} else {
1668+
twoFactorCond = builder.NotIn("id", twoFactorBuilder)
1669+
}
1670+
cond = cond.And(twoFactorCond)
1671+
} else {
1672+
log.Critical("Unknown admin user search filter: %v=%v", filterKey, filterValue)
1673+
}
1674+
}
16461675
}
1647-
16481676
} else {
16491677
// Force visibility for privacy
16501678
// Not logged in - only public users

‎options/locale/locale_en-US.ini

+12
Original file line numberDiff line numberDiff line change
@@ -2347,6 +2347,18 @@ users.still_own_repo = This user still owns one or more repositories. Delete or
23472347
users.still_has_org = This user is a member of an organization. Remove the user from any organizations first.
23482348
users.deletion_success = The user account has been deleted.
23492349
users.reset_2fa = Reset 2FA
2350+
users.list_status_filter.menu_text = Filter
2351+
users.list_status_filter.reset = Reset
2352+
users.list_status_filter.is_active = Active
2353+
users.list_status_filter.not_active = Inactive
2354+
users.list_status_filter.is_admin = Admin
2355+
users.list_status_filter.not_admin = Not Admin
2356+
users.list_status_filter.is_restricted = Restricted
2357+
users.list_status_filter.not_restricted = Not Restricted
2358+
users.list_status_filter.is_prohibit_login = Prohibit Login
2359+
users.list_status_filter.not_prohibit_login = Allow Login
2360+
users.list_status_filter.is_2fa_enabled = 2FA Enabled
2361+
users.list_status_filter.not_2fa_enabled = 2FA Disabled
23502362

23512363
emails.email_manage_panel = User Email Management
23522364
emails.primary = Primary

‎options/locale/locale_zh-CN.ini

+15-3
Original file line numberDiff line numberDiff line change
@@ -634,8 +634,8 @@ last_used=上次使用在
634634
no_activity=没有最近活动
635635
can_read_info=读取
636636
can_write_info=写入
637-
key_state_desc=7 天内使用过该密钥
638-
token_state_desc=7 天内使用过该密钥
637+
key_state_desc=7 天内使用过该密钥
638+
token_state_desc=7 天内使用过该密钥
639639
principal_state_desc=7 天内使用过该规则
640640
show_openid=在个人信息上显示
641641
hide_openid=在个人信息上隐藏
@@ -812,7 +812,7 @@ watchers=关注者
812812
stargazers=称赞者
813813
forks=派生仓库
814814
pick_reaction=选择你的表情
815-
reactions_more=再加载 %d
815+
reactions_more=再加载 %d
816816
unit_disabled=站点管理员已禁用此仓库单元。
817817
language_other=其它
818818
adopt_search=输入用户名以搜索未被收录的仓库... (留空以查找全部)
@@ -2337,6 +2337,18 @@ users.still_own_repo=此用户仍然拥有一个或多个仓库。必须首先
23372337
users.still_has_org=此用户是组织的成员。必须先从组织中删除用户。
23382338
users.deletion_success=用户帐户已被删除。
23392339
users.reset_2fa=重置两步验证
2340+
users.list_status_filter.menu_text = 筛选
2341+
users.list_status_filter.reset = 重置
2342+
users.list_status_filter.is_active = 已激活
2343+
users.list_status_filter.not_active = 未激活
2344+
users.list_status_filter.is_admin = 管理员
2345+
users.list_status_filter.not_admin = 非管理员
2346+
users.list_status_filter.is_restricted = 受限
2347+
users.list_status_filter.not_restricted = 未受限
2348+
users.list_status_filter.is_prohibit_login = 禁止登录
2349+
users.list_status_filter.not_prohibit_login = 允许登录
2350+
users.list_status_filter.is_2fa_enabled = 两步认证已开启
2351+
users.list_status_filter.not_2fa_enabled = 两步认证已禁用
23402352

23412353
emails.email_manage_panel=邮件管理
23422354
emails.primary=主要的

‎routers/web/explore/user.go

+9
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,25 @@ func RenderUserSearch(ctx *context.Context, opts *models.SearchUserOptions, tplN
6262
orderBy = models.SearchOrderByAlphabetically
6363
}
6464

65+
statusFilterKeys := []string{"is_active", "is_admin", "is_restricted", "is_2fa_enabled", "is_prohibit_login"}
66+
statusFilterMap := map[string]string{}
67+
for _, filterKey := range statusFilterKeys {
68+
statusFilterMap[filterKey] = ctx.FormString("status_filter[" + filterKey + "]")
69+
}
70+
6571
opts.Keyword = ctx.FormTrim("q")
6672
opts.OrderBy = orderBy
73+
opts.StatusFilterMap = statusFilterMap
6774
if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) {
6875
users, count, err = models.SearchUsers(opts)
6976
if err != nil {
7077
ctx.ServerError("SearchUsers", err)
7178
return
7279
}
7380
}
81+
7482
ctx.Data["Keyword"] = opts.Keyword
83+
ctx.Data["StatusFilterMap"] = statusFilterMap
7584
ctx.Data["Total"] = count
7685
ctx.Data["Users"] = users
7786
ctx.Data["UsersTwoFaStatus"] = models.UserList(users).GetTwoFaStatus()

‎templates/admin/base/search.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</div>
1616
</div>
1717
</div>
18-
<form class="ui form ignore-dirty" style="max-width: 90%">
18+
<form class="ui form ignore-dirty" style="max-width: 90%;">
1919
<div class="ui fluid action input">
2020
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
2121
<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>

‎templates/admin/user/list.tmpl

+61-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,67 @@
1010
</div>
1111
</h4>
1212
<div class="ui attached segment">
13-
{{template "admin/base/search" .}}
13+
<form class="ui form ignore-dirty" id="user-list-search-form">
14+
15+
<!-- Right Menu -->
16+
<div class="ui right floated secondary filter menu">
17+
<!-- Status Filter Menu Item -->
18+
<div class="ui dropdown type jump item">
19+
<span class="text">{{.i18n.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}</span>
20+
<div class="menu">
21+
<a class="item j-reset-status-filter">{{.i18n.Tr "admin.users.list_status_filter.reset"}}</a>
22+
<div class="ui divider"></div>
23+
<label class="item"><input type="radio" name="status_filter[is_admin]" value="1"> {{.i18n.Tr "admin.users.list_status_filter.is_admin"}}</label>
24+
<label class="item"><input type="radio" name="status_filter[is_admin]" value="0"> {{.i18n.Tr "admin.users.list_status_filter.not_admin"}}</label>
25+
<div class="ui divider"></div>
26+
<label class="item"><input type="radio" name="status_filter[is_active]" value="1"> {{.i18n.Tr "admin.users.list_status_filter.is_active"}}</label>
27+
<label class="item"><input type="radio" name="status_filter[is_active]" value="0"> {{.i18n.Tr "admin.users.list_status_filter.not_active"}}</label>
28+
<div class="ui divider"></div>
29+
<label class="item"><input type="radio" name="status_filter[is_restricted]" value="0"> {{.i18n.Tr "admin.users.list_status_filter.not_restricted"}}</label>
30+
<label class="item"><input type="radio" name="status_filter[is_restricted]" value="1"> {{.i18n.Tr "admin.users.list_status_filter.is_restricted"}}</label>
31+
<div class="ui divider"></div>
32+
<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="0"> {{.i18n.Tr "admin.users.list_status_filter.not_prohibit_login"}}</label>
33+
<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="1"> {{.i18n.Tr "admin.users.list_status_filter.is_prohibit_login"}}</label>
34+
<div class="ui divider"></div>
35+
<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="1"> {{.i18n.Tr "admin.users.list_status_filter.is_2fa_enabled"}}</label>
36+
<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="0"> {{.i18n.Tr "admin.users.list_status_filter.not_2fa_enabled"}}</label>
37+
</div>
38+
</div>
39+
40+
<!-- Sort Menu Item -->
41+
<div class="ui dropdown type jump item">
42+
<span class="text">
43+
{{.i18n.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
44+
</span>
45+
<div class="menu">
46+
<button class="item" name="sort" value="oldest">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</button>
47+
<button class="item" name="sort" value="newest">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</button>
48+
<button class="item" name="sort" value="alphabetically">{{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}}</button>
49+
<button class="item" name="sort" value="reversealphabetically">{{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</button>
50+
<button class="item" name="sort" value="recentupdate">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</button>
51+
<button class="item" name="sort" value="leastupdate">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</button>
52+
</div>
53+
</div>
54+
</div>
55+
56+
<!-- Search Text -->
57+
<div class="ui fluid action input" style="max-width: 70%;">
58+
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
59+
<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
60+
</div>
61+
62+
{{/* here we have valid go template syntax, but eslint doesn't like it and reports "error Parsing error: Unexpected token {" */}}
63+
<script>
64+
<!-- /* eslint-disable */ -->
65+
(function() {
66+
window.giteaContext = window.giteaContext || {};
67+
window.giteaContext.adminUserListSearchForm = {
68+
statusFilterMap: {{.StatusFilterMap}},
69+
sortType: {{.SortType}} || 'oldest'
70+
}
71+
})();
72+
</script>
73+
</form>
1474
</div>
1575
<div class="ui attached table segment">
1676
<table class="ui very basic striped table">

‎web_src/js/features/admin-users.js

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
export function initAdminUserListSearchForm() {
2+
if (!$('.admin').length) return;
3+
if (!window.giteaContext || !window.giteaContext.adminUserListSearchForm) return;
4+
5+
const $form = $('#user-list-search-form');
6+
if (!$form.length) return;
7+
8+
const searchForm = window.giteaContext.adminUserListSearchForm;
9+
10+
$form.find(`button[name=sort][value=${searchForm.sortType}]`).addClass('active');
11+
12+
if (searchForm.statusFilterMap) {
13+
for (const [k, v] of Object.entries(searchForm.statusFilterMap)) {
14+
if (!v) continue;
15+
$form.find(`input[name="status_filter[${k}]"][value=${v}]`).prop('checked', true);
16+
}
17+
}
18+
19+
$form.find(`input[type=radio]`).click(() => {
20+
$form.submit();
21+
return false;
22+
});
23+
24+
$form.find('.j-reset-status-filter').click(() => {
25+
$form.find(`input[type=radio]`).each((_, e) => {
26+
const $e = $(e);
27+
if ($e.attr('name').startsWith('status_filter[')) {
28+
$e.prop('checked', false);
29+
}
30+
});
31+
$form.submit();
32+
return false;
33+
});
34+
}

‎web_src/js/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import initMigration from './features/migration.js';
1717
import initProject from './features/projects.js';
1818
import initServiceWorker from './features/serviceworker.js';
1919
import initTableSort from './features/tablesort.js';
20+
import {initAdminUserListSearchForm} from './features/admin-users.js';
2021
import {createCodeEditor, createMonaco} from './features/codeeditor.js';
2122
import {initMarkupAnchors} from './markup/anchors.js';
2223
import {initNotificationsTable, initNotificationCount} from './features/notification.js';
@@ -2839,6 +2840,7 @@ $(document).ready(async () => {
28392840
initFileViewToggle();
28402841
initReleaseEditor();
28412842
initRelease();
2843+
initAdminUserListSearchForm();
28422844

28432845
const routes = {
28442846
'div.user.settings': initUserSettings,

0 commit comments

Comments
 (0)