domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Only show part of members on orgnization dashboard and add paging for orgnization members page (#9092)

Browse source 
* Only show part of members on orgnization dashboard and add paging for orgnization members page

* fix test

* fix typo
This commit is contained in:
Lunny Xiao 2019-12-06 13:34:54 +08:00 • committed by GitHub
parent 77730db257
commit e3081c667a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 121 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

29
routers/user/home.go
View file

@ -537,14 +537,37 @@ func showOrgProfile(ctx *context.Context) {
return
}
if err := org.GetMembers(); err != nil {
ctx.ServerError("GetMembers", err)
var opts = models.FindOrgMembersOpts{
OrgID: org.ID,
PublicOnly: true,
Limit: 25,
}
if ctx.User != nil {
isMember, err := org.IsOrgMember(ctx.User.ID)
if err != nil {
ctx.Error(500, "IsOrgMember")
return
}
opts.PublicOnly = !isMember
}
members, _, err := models.FindOrgMembers(opts)
if err != nil {
ctx.ServerError("FindOrgMembers", err)
return
}
membersCount, err := models.CountOrgMembers(opts)
if err != nil {
ctx.ServerError("CountOrgMembers", err)
return
}
ctx.Data["Repos"] = repos
ctx.Data["Total"] = count
ctx.Data["Members"] = org.Members
ctx.Data["MembersTotal"] = membersCount
ctx.Data["Members"] = members
ctx.Data["Teams"] = org.Teams
pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5)