Skip to content

Fix 404 error when remove self from an organization #26362

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 6 commits into from
Aug 12, 2023
Merged

Fix 404 error when remove self from an organization #26362

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fb3aad
fix
yp05327 Aug 7, 2023
2c8a197
Update routers/web/org/teams.go
yp05327 Aug 7, 2023
44ab186
Update routers/web/org/teams.go
yp05327 Aug 7, 2023
e401d26
Merge branch 'main' into fix-404-when-remove-self-from-org
GiteaBot Aug 7, 2023
3f874c5
improve
yp05327 Aug 8, 2023
8df7ff1
Merge branch 'main' into fix-404-when-remove-self-from-org
wxiaoguang Aug 12, 2023
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
27 changes: 18 additions & 9 deletions routers/web/org/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,13 @@ func TeamsAction(ctx *context.Context) {
ctx.ServerError("IsOrganizationMember", err)
return
} else if !isOrgMember {
redirect = setting.AppSubURL + "/"
if ctx.Org.Organization.Visibility.IsPrivate() {
redirect = setting.AppSubURL + "/"
} else {
redirect = ctx.Org.Organization.HomeLink()
}
}
ctx.JSON(http.StatusOK,
map[string]any{
"redirect": redirect,
})
ctx.JSONRedirect(redirect)
return
case "remove":
if !ctx.Org.IsOwner {
Expand All @@ -124,10 +125,18 @@ func TeamsAction(ctx *context.Context) {
return
}
}
ctx.JSON(http.StatusOK,
map[string]any{
"redirect": ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName),
})
redirect := ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName)
if isOrgMember, err := org_model.IsOrganizationMember(ctx, ctx.Org.Organization.ID, ctx.Doer.ID); err != nil {
ctx.ServerError("IsOrganizationMember", err)
return
} else if !isOrgMember {
if ctx.Org.Organization.Visibility.IsPrivate() {
redirect = setting.AppSubURL + "/"
} else {
redirect = ctx.Org.Organization.HomeLink()
}
}
ctx.JSONRedirect(redirect)
Copy link
Member

@delvh delvh Aug 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about extracting this check into a separate method and giving it a parameter defaultRedirect?
You call it twice at the moment (90-101 and 128-139).

Copy link
Contributor Author

@yp05327 yp05327 Aug 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

return
case "add":
if !ctx.Org.IsOwner {
Expand Down