Skip to content

Fix bug to go to 404 when creating pull request #29059

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

Closed
wants to merge 11 commits into from
Closed

Fix bug to go to 404 when creating pull request #29059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bd30dfa
Fix bug to go to 404 when creating pull request
lunny Feb 5, 2024
d78146c
Remove br for json error
lunny Feb 5, 2024
17225a6
Merge branch 'main' into lunny/fix_pr_hook2
lunny Feb 22, 2024
7d86652
Merge branch 'main' into lunny/fix_pr_hook2
6543 Feb 22, 2024
c5c48bc
Merge branch 'main' into lunny/fix_pr_hook2
6543 Feb 22, 2024
057034f
Merge branch 'main' into lunny/fix_pr_hook2
lunny Feb 27, 2024
806b394
Merge branch 'lunny/fix_pr_hook2' of github.com:lunny/gitea into lunn…
lunny Feb 27, 2024
ca72153
Merge branch 'main' into lunny/fix_pr_hook2
lunny Feb 29, 2024
31b4dcf
Redirect to compare link again with warning
lunny Feb 29, 2024
9d120ba
Add translation back
lunny Mar 1, 2024
06c838f
Revert "Add translation back"
lunny Mar 1, 2024
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
4 changes: 2 additions & 2 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1792,9 +1792,9 @@ pulls.unrelated_histories = Merge Failed: The merge head and base do not share a
pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again.
pulls.head_out_of_date = Merge Failed: Whilst generating the merge, the head was updated. Hint: Try again.
pulls.has_merged = Failed: The pull request has been merged, you cannot merge again or change the target branch.
pulls.push_rejected = Merge Failed: The push was rejected. Review the Git Hooks for this repository.
pulls.push_rejected = Push Failed: The push was rejected. Review the Git Hooks for this repository.
pulls.push_rejected_summary = Full Rejection Message
pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the Git Hooks for this repository
pulls.push_rejected_no_message = Push Failed: The push was rejected but there was no remote message. Review the Git Hooks for this repository
pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`
pulls.status_checking = Some checks are pending
pulls.status_checks_success = All checks were successful
Expand Down
4 changes: 2 additions & 2 deletions routers/web/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,8 +1500,8 @@ func CompareAndPullRequestPost(ctx *context.Context) {
ctx.ServerError("CompareAndPullRequest.HTMLString", err)
return
}
ctx.Flash.Error(flashError)
ctx.JSONRedirect(pullIssue.Link()) // FIXME: it's unfriendly, and will make the content lost
ctx.Flash.Warning(flashError)
ctx.JSONRedirect(ctx.Link)
Copy link
Contributor

@wxiaoguang wxiaoguang Mar 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Well, the code just went back to the old. So why need this PR then?

(Oh I see, fix the 404 .... use a ctx.Link now)

Copy link
Contributor

Choose a reason for hiding this comment

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

But why not keep the "Error" and keep the comment?

Copy link
Member Author

Choose a reason for hiding this comment

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

The UI very special, when using Error, the error prompt section will displayed on the left of the input box.

Copy link
Contributor

@wxiaoguang wxiaoguang Mar 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

So when developing Gitea, when there is a unclear problem, should it always be hacky patched, but not really resolve it clearly?

At least, from the framework's view, Flash.Error and Flash.Warning should behave similarly?

return
}
ctx.ServerError("NewPullRequest", err)
Expand Down