Add IsAdmin in Organization
#28838
Add IsAdmin in Organization
#28838
Conversation
| @@ -145,6 +148,11 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { | |||
| ctx.ServerError("IsOrgMember", err) | |||
| return | |||
| } | |||
| ctx.Org.IsAdmin, err = org.IsOrgAdmin(ctx, ctx.Doer.ID) | |||
There was a problem hiding this comment.
Shouldn't we only execute this check if the user is actually a member?
There was a problem hiding this comment.
Did some changes in 84bab56
| IsMember bool // Is member of the org | ||
| IsAdmin bool // Is admin of the org | ||
| IsTeamMember bool // Is member of team, only used in urls which has team param | ||
| IsTeamAdmin bool // Is in owner team or team that has admin permission level, only used in urls which has team param |
There was a problem hiding this comment.
What's the different between IsTeamAdmin and IsAdmin?
There was a problem hiding this comment.
🤨 Sounds like they are the same.
But if that is indeed the case, I still support renaming IsTeamAdmin to IsAdmin or IsOrgAdmin (if we are concerned about confusion with site admins) as IsTeamAdmin reads as if the user only has admin rights within the team instead of the whole org.
There was a problem hiding this comment.
First, ctx.Org.IsTeamAdmin is only used in OrgAssignment function for checking requireTeamAdmin.
Then, ctx.Data["IsTeamAdmin"] is empty when the URL doesn't have team param.
So if we want to detect whether doer is the admin in these pages.
So I think we need ctx.Data["IsOrganizationAdmin"], and ctx.Org.IsTeamAdmin can be removed here.
Add
IsAdminin Organization andIsOrganizationAdminin context data.Then we can easily check whether doer is an organization admin.
ps: a previous PR for #28837