Skip to content

Commit 3ade541

Browse files
committed
improve
1 parent 5effed4 commit 3ade541

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

modules/context/org.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ type Organization struct {
2424
Organization *organization.Organization
2525
OrgLink string
2626
CanCreateOrgRepo bool
27+
PublicMemberOnly bool // Only display public members
2728

2829
Team *organization.Team
2930
Teams []*organization.Team
@@ -173,11 +174,11 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
173174
ctx.Data["OrgLink"] = ctx.Org.OrgLink
174175

175176
// Member
177+
ctx.Org.PublicMemberOnly = ctx.Doer == nil || !ctx.Org.IsMember && !ctx.Doer.IsAdmin
176178
opts := &organization.FindOrgMembersOpts{
177179
OrgID: org.ID,
178-
PublicOnly: true,
180+
PublicOnly: ctx.Org.PublicMemberOnly,
179181
}
180-
opts.PublicOnly = ctx.Doer == nil || !ctx.Org.IsMember && !ctx.Doer.IsAdmin
181182
ctx.Data["NumMembers"], err = organization.CountOrgMembers(opts)
182183
if err != nil {
183184
ctx.ServerError("CountOrgMembers", err)

routers/web/org/home.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,9 @@ func Home(ctx *context.Context) {
119119

120120
opts := &organization.FindOrgMembersOpts{
121121
OrgID: org.ID,
122-
PublicOnly: true,
122+
PublicOnly: ctx.Org.PublicMemberOnly,
123123
ListOptions: db.ListOptions{Page: 1, PageSize: 25},
124124
}
125-
126-
if ctx.Doer != nil {
127-
opts.PublicOnly = !ctx.Org.IsMember && !ctx.Doer.IsAdmin
128-
}
129-
130125
members, _, err := organization.FindOrgMembers(opts)
131126
if err != nil {
132127
ctx.ServerError("FindOrgMembers", err)

0 commit comments

Comments
 (0)