Fix 404 error when remove self from an organization #26362
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/S
wxiaoguang
approved these changes
Aug 7, 2023
GiteaBot
added
lgtm/need 1
wxiaoguang
reviewed
Aug 7, 2023
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
lunny
approved these changes
Aug 7, 2023
GiteaBot
added
lgtm/done
lunny
added
reviewed/wait-merge
delvh
reviewed
Aug 7, 2023
routers/web/org/teams.go
Outdated
Comment on lines
128
to
139
| 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) |
There was a problem hiding this comment.
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).
delvh
removed
the
reviewed/wait-merge
pull-request-size
bot
added
size/M
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Aug 14, 2023
* upstream/main: (24 commits) Update zh-cn documentation (go-gitea#26406) Fix NuGet search endpoints (go-gitea#25613) Fix tooltip of commit select button (go-gitea#26472) fix grab cursor on default column (go-gitea#26476) Fix storage path logic especially for relative paths (go-gitea#26441) Rename `Sync2` -> `Sync` (go-gitea#26479) Add ThreadID parameter for Telegram webhooks (go-gitea#25996) Fix stderr usages (go-gitea#26477) Use correct pull request commit link instead of a generic commit link (go-gitea#26434) Close stdout correctly for "git blame" (go-gitea#26470) Refactor tests (go-gitea#26464) Remove last newline from config file (go-gitea#26468) Add matrix to support (go-gitea#26382) Refactor project templates (go-gitea#26448) Avoiding accessing undefined mentionValues (go-gitea#26461) Tweak actions menu (go-gitea#26278) Adjust minio new sequence, now it will check whether bucket exist first and then create one if it doesn't exist (go-gitea#26420) Set commit id when ref used explicitly (go-gitea#26447) Fix 404 error when remove self from an organization (go-gitea#26362) Update index doc (go-gitea#26455) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Same to #24322
Not only
leaveaction but alsoremoveaction should check whether user still belongs to the org.