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.

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

Fix incorrect redirection when creating a PR fails #29537

Merged
merged 3 commits into from
Mar 2, 2024

Conversation

wxiaoguang
Copy link
Contributor

This is only a quick fix to make it easier to backport.

After this PR gets merged, I will propose a new PR to fix the FIXME.

image

@wxiaoguang wxiaoguang added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Mar 2, 2024
@wxiaoguang wxiaoguang added this to the 1.22.0 milestone Mar 2, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 2, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 2, 2024
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 2, 2024
@wxiaoguang wxiaoguang changed the title Fix incorrect redirection when create PR fails Fix incorrect redirection when creating a PR fails Mar 2, 2024
@wxiaoguang
Copy link
Contributor Author

I removed all these {{if .Flash.WarningMsg}} code blocks. Could you check whether it works as your expectation? @wolfogre

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 2, 2024
@@ -1501,7 +1501,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
return
}
ctx.Flash.Error(flashError)
ctx.JSONRedirect(pullIssue.Link()) // FIXME: it's unfriendly, and will make the content lost
ctx.JSONRedirect(ctx.Link + "?" + ctx.Req.URL.RawQuery) // FIXME: it's unfriendly, and will make the content lost
Copy link
Member

Choose a reason for hiding this comment

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

Is it still unfriendly?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. See the description:

This is only a quick fix to make it easier to backport.
After this PR gets merged, I will propose a new PR to fix the FIXME.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, the filled form content will be lost because of the redirection. (The pull request title and content)
But it's the same behavior as before. So this can be resolved in future PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

-> Make PR form use toast to show error message #29545

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 2, 2024
@lunny lunny enabled auto-merge (squash) March 2, 2024 12:09
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 2, 2024
@lunny lunny merged commit e650f64 into go-gitea:main Mar 2, 2024
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 2, 2024
This is only a quick fix to make it easier to backport.

After this PR gets merged, I will propose a new PR to fix the FIXME.

<details>

![image](https://github.com/go-gitea/gitea/assets/2114189/98d1d5c4-2e79-4a75-80e9-76fd898986e0)

</details>
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Mar 2, 2024
@wxiaoguang wxiaoguang deleted the fix-pr-error branch March 2, 2024 12:46
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 2, 2024
* upstream/main:
  Fix a bug returning 404 when display a single tag with no release (go-gitea#29466)
  Add a check for when the command is canceled by the program on Window… (go-gitea#29538)
  Fix incorrect redirection when creating a PR fails (go-gitea#29537)
  Fix incorrect subpath in links (go-gitea#29535)
  Fix issue link does not support quotes (go-gitea#29484) (go-gitea#29487)
silverwind pushed a commit that referenced this pull request Mar 2, 2024
Backport #29537 by wxiaoguang

This is only a quick fix to make it easier to backport.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants