mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-02 22:01:44 +02:00
Only show part of members on orgnization dashboard and add paging for orgnization members page (#9092)
* Only show part of members on orgnization dashboard and add paging for orgnization members page * fix test * fix typo
This commit is contained in:
1 parent
77730db257
commit
e3081c667a
9 files changed
+121
-46
No files matched your search
@@ -18,30 +18,13 @@ import (
|
||||
// listMembers list an organization's members
|
||||
func listMembers(ctx *context.APIContext, publicOnly bool) {
|
||||
var members []*models.User
|
||||
if publicOnly {
|
||||
orgUsers, err := models.GetOrgUsersByOrgID(ctx.Org.Organization.ID)
|
||||
if err != nil {
|
||||
ctx.Error(500, "GetOrgUsersByOrgID", err)
|
||||
return
|
||||
}
|
||||
|
||||
memberIDs := make([]int64, 0, len(orgUsers))
|
||||
for _, orgUser := range orgUsers {
|
||||
if orgUser.IsPublic {
|
||||
memberIDs = append(memberIDs, orgUser.UID)
|
||||
}
|
||||
}
|
||||
|
||||
if members, err = models.GetUsersByIDs(memberIDs); err != nil {
|
||||
ctx.Error(500, "GetUsersByIDs", err)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if err := ctx.Org.Organization.GetMembers(); err != nil {
|
||||
ctx.Error(500, "GetMembers", err)
|
||||
return
|
||||
}
|
||||
members = ctx.Org.Organization.Members
|
||||
members, _, err := models.FindOrgMembers(models.FindOrgMembersOpts{
|
||||
OrgID: ctx.Org.Organization.ID,
|
||||
PublicOnly: publicOnly,
|
||||
})
|
||||
if err != nil {
|
||||
ctx.Error(500, "GetUsersByIDs", err)
|
||||
return
|
||||
}
|
||||
|
||||
apiMembers := make([]*api.User, len(members))
|
||||
|
||||
Reference in new issue
Block a user