Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-11 09:15:31 +02:00
Code Issues Activity

Merge 34c40adb99ff0a8d7128bac83f263dd92a87b36f into ce089f498bce32305b2d9e8c6adfd8cb7c82f88f

Browse Source
This commit is contained in:
Lunny Xiao 2026-05-09 14:08:27 +00:00 committed by GitHub
commit 4186822d5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 143 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
models/organization/org.go
View File

@ -181,15 +181,47 @@ func (org *Organization) HomeLink() string {
// FindOrgMembersOpts represents find org members conditions
type FindOrgMembersOpts struct {
db.ListOptions
Doer *user_model.User
IsDoerMember bool
OrgID int64
Doer *user_model.User
IsDoerMember bool
OrgID int64
Keyword string
SearchByEmail bool
}
func (opts FindOrgMembersOpts) PublicOnly() bool {
return opts.Doer == nil || !(opts.IsDoerMember || opts.Doer.IsAdmin)
}
func (opts FindOrgMembersOpts) applyKeywordFilter(sess *xorm.Session) (*xorm.Session, bool) {
if opts.Keyword == "" {
return sess, false
}
lowerKeyword := strings.ToLower(opts.Keyword)
keywordCond := builder.Or(
builder.Like{"`user`.lower_name", lowerKeyword},
builder.Like{"LOWER(`user`.full_name)", lowerKeyword},
)
if opts.SearchByEmail {
var emailCond builder.Cond = builder.Like{"LOWER(`user`.email)", lowerKeyword}
switch {
case opts.Doer == nil:
emailCond = emailCond.And(builder.Eq{"`user`.keep_email_private": false})
case !opts.Doer.IsAdmin:
emailCond = emailCond.And(
builder.Or(
builder.Eq{"`user`.keep_email_private": false},
builder.Eq{"`user`.id": opts.Doer.ID},
),
)
}
keywordCond = keywordCond.Or(emailCond)
}
sess = sess.Join("INNER", "`user`", "org_user.uid = `user`.id").And(keywordCond)
return sess, true
}
// applyTeamMatesOnlyFilter make sure restricted users only see public team members and there own team mates
func (opts FindOrgMembersOpts) applyTeamMatesOnlyFilter(sess *xorm.Session) {
if opts.Doer != nil && opts.IsDoerMember && opts.Doer.IsRestricted {
@ -213,6 +245,7 @@ func CountOrgMembers(ctx context.Context, opts *FindOrgMembersOpts) (int64, erro
} else {
opts.applyTeamMatesOnlyFilter(sess)
}
sess, _ = opts.applyKeywordFilter(sess)
return sess.Count(new(OrgUser))
}
@ -461,7 +494,11 @@ func GetOrgUsersByOrgID(ctx context.Context, opts *FindOrgMembersOpts) ([]*OrgUs
} else {
opts.applyTeamMatesOnlyFilter(sess)
}
if keywordSess, hasKeyword := opts.applyKeywordFilter(sess); hasKeyword {
sess = keywordSess.Select("org_user.*")
}
sess = sess.OrderBy("org_user.uid ASC")
if opts.ListOptions.PageSize > 0 {
sess = db.SetSessionPagination(sess, opts)

74
models/organization/org_test.go
View File

@ -288,6 +288,80 @@ func TestGetOrgUsersByOrgID(t *testing.T) {
assert.Empty(t, orgUsers)
}
func TestOrgMembersSearch(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())
member := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
testCases := []struct {
name string
opts *organization.FindOrgMembersOpts
expectedUIDs []int64
}{
{
name: "match by username",
opts: &organization.FindOrgMembersOpts{
OrgID: 3,
Doer: member,
IsDoerMember: true,
Keyword: "user4",
SearchByEmail: true,
},
expectedUIDs: []int64{4},
},
{
name: "match by full name",
opts: &organization.FindOrgMembersOpts{
OrgID: 3,
Doer: member,
IsDoerMember: true,
Keyword: "user27",
SearchByEmail: true,
},
expectedUIDs: []int64{28},
},
{
name: "private email hidden",
opts: &organization.FindOrgMembersOpts{
OrgID: 3,
Doer: member,
IsDoerMember: true,
Keyword: "user2@example.com",
SearchByEmail: true,
},
expectedUIDs: []int64{},
},
{
name: "admin can search private email",
opts: &organization.FindOrgMembersOpts{
OrgID: 3,
Doer: admin,
Keyword: "user2@example.com",
SearchByEmail: true,
},
expectedUIDs: []int64{2},
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
count, err := organization.CountOrgMembers(t.Context(), tc.opts)
assert.NoError(t, err)
assert.EqualValues(t, len(tc.expectedUIDs), count)
members, err := organization.GetOrgUsersByOrgID(t.Context(), tc.opts)
assert.NoError(t, err)
memberUIDs := make([]int64, 0, len(members))
for _, member := range members {
memberUIDs = append(memberUIDs, member.UID)
}
slices.Sort(memberUIDs)
assert.Equal(t, tc.expectedUIDs, memberUIDs)
})
}
}
func TestChangeOrgUserStatus(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())

16
routers/web/org/members.go
View File

@ -31,10 +31,14 @@ func Members(ctx *context.Context) {
ctx.Data["PageIsOrgMembers"] = true
page := max(ctx.FormInt("page"), 1)
keyword := ctx.FormTrim("q")
ctx.Data["Keyword"] = keyword
opts := &organization.FindOrgMembersOpts{
Doer: ctx.Doer,
OrgID: org.ID,
Doer: ctx.Doer,
OrgID: org.ID,
Keyword: keyword,
SearchByEmail: true,
}
if ctx.Doer != nil {
@ -58,9 +62,11 @@ func Members(ctx *context.Context) {
return
}
pager := context.NewPagination(total, setting.UI.MembersPagingNum, page, 5)
pageSize := setting.UI.MembersPagingNum
pager := context.NewPagination(total, pageSize, page, 5)
pager.AddParamFromRequest(ctx.Req)
opts.ListOptions.Page = page
opts.ListOptions.PageSize = setting.UI.MembersPagingNum
opts.ListOptions.PageSize = pageSize
members, membersIsPublic, err := organization.FindOrgMembers(ctx, opts)
if err != nil {
ctx.ServerError("GetMembers", err)
@ -68,6 +74,8 @@ func Members(ctx *context.Context) {
}
ctx.Data["Page"] = pager
ctx.Data["Members"] = members
ctx.Data["MembersShown"] = len(members)
ctx.Data["MembersTotal"] = total
ctx.Data["MembersIsPublicMember"] = membersIsPublic
ctx.Data["MembersIsUserOrgOwner"] = organization.IsUserOrgOwner(ctx, members, org.ID)
ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus(ctx)

17
templates/org/member/members.tmpl
View File

@ -11,6 +11,17 @@
</div>
<div class="divider"></div>
{{end}}
<div class="ui small secondary filter menu">
<form id="org-member-search-form" class="ui form ignore-dirty tw-flex-1 tw-flex tw-items-center tw-gap-x-2">
<div class="ui small fluid action input tw-flex-1">
{{template "shared/search/input" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
{{template "shared/search/button"}}
</div>
</form>
<div class="item tw-text-text-light">
{{ctx.Locale.Tr "org.members"}}: {{CountFmt .MembersShown}} / {{CountFmt .MembersTotal}}
</div>
</div>
<div class="flex-divided-list items-with-main">
{{range .Members}}
{{$isPublic := index $.MembersIsPublicMember .ID}}
@ -67,6 +78,12 @@
{{end}}
</div>
</div>
{{else}}
<div class="flex-item">
<div class="flex-item-main">
{{ctx.Locale.Tr "search.no_results"}}
</div>
</div>
{{end}}
</div>
{{template "base/paginate" .}}