Skip to content

Allow adminstrator teams members to see other teams (#18918) #18919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2022
Merged

Allow adminstrator teams members to see other teams (#18918) #18919

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b086e7
Allow adminstrator teams members to see other teams (#18918)
Feb 26, 2022
4b5a8ca
Update backport
Feb 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion modules/context/org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,11 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {

// Team.
if ctx.Org.IsMember {
if ctx.Org.IsOwner {
maxPerm, err := org.GetOrgUserMaxAuthorizeLevel(ctx.User.ID)
if err != nil {
ctx.ServerError("GetOrgUserMaxAuthorizeLevel", err)
}
if ctx.Org.IsOwner || maxPerm >= perm.AccessModeAdmin {
ctx.Org.Teams, err = org.LoadTeams()
if err != nil {
ctx.ServerError("LoadTeams", err)
Expand Down