Skip to content
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

Jump to bottom

Fix 404 error when leaving the last private org team #24322

Merged
merged 9 commits into from
Apr 26, 2023
Merged

Fix 404 error when leaving the last private org team #24322

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
54c874b
fix
yp05327 Apr 25, 2023
e7c432c
add return
yp05327 Apr 25, 2023
2b2f136
use AppSubURL
yp05327 Apr 26, 2023
cac321e
Merge branch 'main' into fix-404-error-when-leave-private-org-team
yp05327 Apr 26, 2023
51880b6
Merge branch 'main' into fix-404-error-when-leave-private-org-team
GiteaBot Apr 26, 2023
dbd39d0
Merge branch 'main' into fix-404-error-when-leave-private-org-team
GiteaBot Apr 26, 2023
a360079
Merge branch 'main' into fix-404-error-when-leave-private-org-team
GiteaBot Apr 26, 2023
20e3fdd
Merge branch 'main' into fix-404-error-when-leave-private-org-team
GiteaBot Apr 26, 2023
42ee4af
Merge branch 'main' into fix-404-error-when-leave-private-org-team
GiteaBot Apr 26, 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
10 changes: 9 additions & 1 deletion routers/web/org/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,17 @@ func TeamsAction(ctx *context.Context) {
return
}
}

redirect := ctx.Org.OrgLink + "/teams/"
if isOrgMember, err := org_model.IsOrganizationMember(ctx, ctx.Org.Organization.ID, ctx.Doer.ID); err != nil {
ctx.ServerError("IsOrganizationMember", err)
return
} else if !isOrgMember {
redirect = setting.AppSubURL + "/"
}
ctx.JSON(http.StatusOK,
map[string]interface{}{
"redirect": ctx.Org.OrgLink + "/teams/",
"redirect": redirect,
})
return
case "remove":
Expand Down