Merge branch 'main' into limit-org-member-view-of-restricted-users

Author: 6543

models/organization/org.go

@@ -197,17 +197,17 @@ func (org *Organization) CanCreateRepo() bool {
 // FindOrgMembersOpts represensts find org members conditions
 type FindOrgMembersOpts struct {
 	db.ListOptions
-	Doer     *user_model.User
-	IsMember bool
-	OrgID    int64
+	Doer         *user_model.User
+	IsDoerMember bool
+	OrgID        int64
 }
 
 func (opts FindOrgMembersOpts) PublicOnly() bool {
-	return opts.Doer == nil || !(opts.IsMember || opts.Doer.IsAdmin)
+	return opts.Doer == nil || !(opts.IsDoerMember || opts.Doer.IsAdmin)
 }
 
 func (opts FindOrgMembersOpts) applyTeamMatesOnlyFilter(sess *xorm.Session) {
-	if opts.Doer != nil && opts.IsMember && opts.Doer.IsRestricted {
+	if opts.Doer != nil && opts.IsDoerMember && opts.Doer.IsRestricted {
 		teamMates := builder.Select("DISTINCT team_user.uid").
 			From("team_user").
 			Where(builder.In("team_user.team_id", getUserTeamIDsQueryBuilder(opts.OrgID, opts.Doer.ID))).

routers/api/v1/org/member.go

@@ -20,10 +20,10 @@ import (
 // listMembers list an organization's members
 func listMembers(ctx *context.APIContext, isMember bool) {
 	opts := &organization.FindOrgMembersOpts{
-		Doer:        ctx.Doer,
-		IsMember:    isMember,
-		OrgID:       ctx.Org.Organization.ID,
-		ListOptions: utils.GetListOptions(ctx),
+		Doer:         ctx.Doer,
+		IsDoerMember: isMember,
+		OrgID:        ctx.Org.Organization.ID,
+		ListOptions:  utils.GetListOptions(ctx),
 	}
 
 	count, err := organization.CountOrgMembers(ctx, opts)

routers/web/org/home.go

@@ -95,10 +95,10 @@ func home(ctx *context.Context, viewRepositories bool) {
 	}
 
 	opts := &organization.FindOrgMembersOpts{
-		Doer:        ctx.Doer,
-		OrgID:       org.ID,
-		IsMember:    ctx.Org.IsMember,
-		ListOptions: db.ListOptions{Page: 1, PageSize: 25},
+		Doer:         ctx.Doer,
+		OrgID:        org.ID,
+		IsDoerMember: ctx.Org.IsMember,
+		ListOptions:  db.ListOptions{Page: 1, PageSize: 25},
 	}
 
 	members, _, err := organization.FindOrgMembers(ctx, opts)

routers/web/org/members.go

@@ -44,7 +44,7 @@ func Members(ctx *context.Context) {
 			ctx.Error(http.StatusInternalServerError, "IsOrgMember")
 			return
 		}
-		opts.IsMember = isMember
+		opts.IsDoerMember = isMember
 	}
 	ctx.Data["PublicOnly"] = opts.PublicOnly()
 

services/context/org.go

@@ -176,9 +176,9 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 
 	// Member
 	opts := &organization.FindOrgMembersOpts{
-		Doer:     ctx.Doer,
-		OrgID:    org.ID,
-		IsMember: ctx.Org.IsMember,
+		Doer:         ctx.Doer,
+		OrgID:        org.ID,
+		IsDoerMember: ctx.Org.IsMember,
 	}
 	ctx.Data["NumMembers"], err = organization.CountOrgMembers(ctx, opts)
 	if err != nil {