Skip to content

Commit 5128b0b

Browse files
committed
fix lint2 err
1 parent db7a59a commit 5128b0b

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

models/organization/org.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func (opts FindOrgMembersOpts) PublicOnly() bool {
206206
return opts.Doer == nil || !(opts.IsMember || opts.Doer.IsAdmin)
207207
}
208208

209-
func (opts FindOrgMembersOpts) applyTeamMatesOnlyFilter(sess *xorm.Session) error {
209+
func (opts FindOrgMembersOpts) applyTeamMatesOnlyFilter(sess *xorm.Session) {
210210
if opts.Doer != nil && opts.IsMember && opts.Doer.IsRestricted {
211211
teamMates := builder.Select("DISTINCT team_user.uid").
212212
From("team_user").
@@ -224,9 +224,7 @@ func CountOrgMembers(ctx context.Context, opts *FindOrgMembersOpts) (int64, erro
224224
if opts.PublicOnly() {
225225
sess.And("is_public = ?", true)
226226
}
227-
if err := opts.applyTeamMatesOnlyFilter(sess); err != nil {
228-
return 0, err
229-
}
227+
opts.applyTeamMatesOnlyFilter(sess)
230228

231229
return sess.Count(new(OrgUser))
232230
}
@@ -551,9 +549,7 @@ func GetOrgUsersByOrgID(ctx context.Context, opts *FindOrgMembersOpts) ([]*OrgUs
551549
if opts.PublicOnly() {
552550
sess.And("is_public = ?", true)
553551
}
554-
if err := opts.applyTeamMatesOnlyFilter(sess); err != nil {
555-
return nil, err
556-
}
552+
opts.applyTeamMatesOnlyFilter(sess)
557553

558554
if opts.ListOptions.PageSize > 0 {
559555
sess = db.SetSessionPagination(sess, opts)

0 commit comments

Comments
 (0)