NotificationsYou must be signed in to change notification settings
Fork1k
Star11.2k

Commit6b3a731

committed

Allow users to view and modify group membership for the prebuilds system user so that they can configure quotas

1 parentdcc8e9e commit6b3a731Copy full SHA for 6b3a731

File tree

1 file changed

-9

lines changed

enterprise/coderd
- groups.go

1 file changed

-9

lines changed

`‎enterprise/coderd/groups.go‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func (api API) patchGroup(rw http.ResponseWriter, r http.Request) {`
`156`	`156`
`157`	`157`	`currentMembers,err:=api.Database.GetGroupMembersByGroupID(ctx, database.GetGroupMembersByGroupIDParams{`
`158`	`158`	`GroupID:group.ID,`
`159`		`-IncludeSystem:false,`
	`159`	`+IncludeSystem:true,`
`160`	`160`	`})`
`161`	`161`	`iferr!=nil {`
`162`	`162`	`httpapi.InternalServerError(rw,err)`
`@@ -174,7 +174,7 @@ func (api API) patchGroup(rw http.ResponseWriter, r http.Request) {`
`174`	`174`	`_,err:=database.ExpectOne(api.Database.OrganizationMembers(ctx, database.OrganizationMembersParams{`
`175`	`175`	`OrganizationID:group.OrganizationID,`
`176`	`176`	`UserID:uuid.MustParse(id),`
`177`		`-IncludeSystem:false,`
	`177`	`+IncludeSystem:true,`
`178`	`178`	`}))`
`179`	`179`	`iferrors.Is(err,sql.ErrNoRows) {`
`180`	`180`	`httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`
`@@ -290,7 +290,7 @@ func (api API) patchGroup(rw http.ResponseWriter, r http.Request) {`
`290`	`290`
`291`	`291`	`patchedMembers,err:=api.Database.GetGroupMembersByGroupID(ctx, database.GetGroupMembersByGroupIDParams{`
`292`	`292`	`GroupID:group.ID,`
`293`		`-IncludeSystem:false,`
	`293`	`+IncludeSystem:true,`
`294`	`294`	`})`
`295`	`295`	`iferr!=nil {`
`296`	`296`	`httpapi.InternalServerError(rw,err)`
`@@ -301,7 +301,7 @@ func (api API) patchGroup(rw http.ResponseWriter, r http.Request) {`
`301`	`301`
`302`	`302`	`memberCount,err:=api.Database.GetGroupMembersCountByGroupID(ctx, database.GetGroupMembersCountByGroupIDParams{`
`303`	`303`	`GroupID:group.ID,`
`304`		`-IncludeSystem:false,`
	`304`	`+IncludeSystem:true,`
`305`	`305`	`})`
`306`	`306`	`iferr!=nil {`
`307`	`307`	`httpapi.InternalServerError(rw,err)`
`@@ -347,7 +347,7 @@ func (api API) deleteGroup(rw http.ResponseWriter, r http.Request) {`
`347`	`347`
`348`	`348`	`groupMembers,getMembersErr:=api.Database.GetGroupMembersByGroupID(ctx, database.GetGroupMembersByGroupIDParams{`
`349`	`349`	`GroupID:group.ID,`
`350`		`-IncludeSystem:false,`
	`350`	`+IncludeSystem:true,`
`351`	`351`	`})`
`352`	`352`	`ifgetMembersErr!=nil {`
`353`	`353`	`httpapi.InternalServerError(rw,getMembersErr)`
`@@ -401,7 +401,7 @@ func (api API) group(rw http.ResponseWriter, r http.Request) {`
`401`	`401`
`402`	`402`	`users,err:=api.Database.GetGroupMembersByGroupID(ctx, database.GetGroupMembersByGroupIDParams{`
`403`	`403`	`GroupID:group.ID,`
`404`		`-IncludeSystem:false,`
	`404`	`+IncludeSystem:true,`
`405`	`405`	`})`
`406`	`406`	`iferr!=nil&&!errors.Is(err,sql.ErrNoRows) {`
`407`	`407`	`httpapi.InternalServerError(rw,err)`
`@@ -410,7 +410,7 @@ func (api API) group(rw http.ResponseWriter, r http.Request) {`
`410`	`410`
`411`	`411`	`memberCount,err:=api.Database.GetGroupMembersCountByGroupID(ctx, database.GetGroupMembersCountByGroupIDParams{`
`412`	`412`	`GroupID:group.ID,`
`413`		`-IncludeSystem:false,`
	`413`	`+IncludeSystem:true,`
`414`	`414`	`})`
`415`	`415`	`iferr!=nil {`
`416`	`416`	`httpapi.InternalServerError(rw,err)`
`@@ -506,15 +506,15 @@ func (api API) groups(rw http.ResponseWriter, r http.Request) {`
`506`	`506`	`for_,group:=rangegroups {`
`507`	`507`	`members,err:=api.Database.GetGroupMembersByGroupID(ctx, database.GetGroupMembersByGroupIDParams{`
`508`	`508`	`GroupID:group.Group.ID,`
`509`		`-IncludeSystem:false,`
	`509`	`+IncludeSystem:true,`
`510`	`510`	`})`
`511`	`511`	`iferr!=nil {`
`512`	`512`	`httpapi.InternalServerError(rw,err)`
`513`	`513`	`return`
`514`	`514`	`}`
`515`	`515`	`memberCount,err:=api.Database.GetGroupMembersCountByGroupID(ctx, database.GetGroupMembersCountByGroupIDParams{`
`516`	`516`	`GroupID:group.Group.ID,`
`517`		`-IncludeSystem:false,`
	`517`	`+IncludeSystem:true,`
`518`	`518`	`})`
`519`	`519`	`iferr!=nil {`
`520`	`520`	`httpapi.InternalServerError(rw,err)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6b3a731

File tree

1 file changed

1 file changed

`‎enterprise/coderd/groups.go‎`

0 commit comments