File tree 2 files changed +4
-8
lines changed
2 files changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -24,6 +24,7 @@ type Organization struct {
24
24
Organization * organization.Organization
25
25
OrgLink string
26
26
CanCreateOrgRepo bool
27
+ PublicMemberOnly bool // Only display public members
27
28
28
29
Team * organization.Team
29
30
Teams []* organization.Team
@@ -173,11 +174,11 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
173
174
ctx .Data ["OrgLink" ] = ctx .Org .OrgLink
174
175
175
176
// Member
177
+ ctx .Org .PublicMemberOnly = ctx .Doer == nil || ! ctx .Org .IsMember && ! ctx .Doer .IsAdmin
176
178
opts := & organization.FindOrgMembersOpts {
177
179
OrgID : org .ID ,
178
- PublicOnly : true ,
180
+ PublicOnly : ctx . Org . PublicMemberOnly ,
179
181
}
180
- opts .PublicOnly = ctx .Doer == nil || ! ctx .Org .IsMember && ! ctx .Doer .IsAdmin
181
182
ctx .Data ["NumMembers" ], err = organization .CountOrgMembers (opts )
182
183
if err != nil {
183
184
ctx .ServerError ("CountOrgMembers" , err )
Original file line number Diff line number Diff line change @@ -119,14 +119,9 @@ func Home(ctx *context.Context) {
119
119
120
120
opts := & organization.FindOrgMembersOpts {
121
121
OrgID : org .ID ,
122
- PublicOnly : true ,
122
+ PublicOnly : ctx . Org . PublicMemberOnly ,
123
123
ListOptions : db.ListOptions {Page : 1 , PageSize : 25 },
124
124
}
125
-
126
- if ctx .Doer != nil {
127
- opts .PublicOnly = ! ctx .Org .IsMember && ! ctx .Doer .IsAdmin
128
- }
129
-
130
125
members , _ , err := organization .FindOrgMembers (opts )
131
126
if err != nil {
132
127
ctx .ServerError ("FindOrgMembers" , err )
You can’t perform that action at this time.
0 commit comments