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 broken cancel button link on patch page #18718

Merged
merged 6 commits into from
Feb 14, 2022

Conversation

lunny
Copy link
Member

@lunny lunny commented Feb 11, 2022

When clicking cancel on the bottom of patch page, it will go src/master/patch but the treepath patch is not exist. This PR fix that.

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Feb 11, 2022
@codecov-commenter
Copy link

codecov-commenter commented Feb 11, 2022

Codecov Report

Merging #18718 (9f98839) into main (26718a7) will increase coverage by 0.05%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #18718      +/-   ##
==========================================
+ Coverage   46.54%   46.59%   +0.05%     
==========================================
  Files         851      852       +1     
  Lines      122281   122453     +172     
==========================================
+ Hits        56915    57061     +146     
- Misses      58486    58502      +16     
- Partials     6880     6890      +10     
Impacted Files Coverage Δ
routers/web/repo/cherry_pick.go 0.00% <0.00%> (ø)
routers/web/repo/patch.go 0.00% <0.00%> (ø)
modules/log/event.go 57.61% <0.00%> (-2.47%) ⬇️
services/repository/fork.go 37.50% <0.00%> (-0.84%) ⬇️
modules/queue/manager.go 39.59% <0.00%> (-0.83%) ⬇️
services/pull/pull.go 39.62% <0.00%> (-0.63%) ⬇️
modules/queue/workerpool.go 53.00% <0.00%> (-0.55%) ⬇️
modules/context/context.go 64.06% <0.00%> (-0.42%) ⬇️
cmd/admin_auth_ldap.go 79.59% <0.00%> (ø)
services/forms/auth_form.go 100.00% <0.00%> (ø)
... and 14 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 26718a7...9f98839. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 11, 2022
@zeripath
Copy link
Contributor

I'm fairly certain that I put the treepath in because of some other problem that meant it was necessary.

@zeripath zeripath changed the title Fix broken cacnel button link on patch page Fix broken cancel button link on patch page Feb 11, 2022
@zeripath
Copy link
Contributor

It may be that the underlying has editor code has changed in the meantime - in which you could changed all of the ctx.Data["TreePath"] = "patch" to simply ctx.Data["TreePath"] = ""

@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 Feb 12, 2022
@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 Feb 12, 2022
@zeripath zeripath merged commit 08fe6f8 into go-gitea:main Feb 14, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 15, 2022
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Prevent dangling GetAttribute calls (go-gitea#18754)
  Add example to render html files (go-gitea#18736)
  Fix a broken link in `commits_list_small.tmpl` (go-gitea#18763)
  Fix broken cancel button link on patch page (go-gitea#18718)
  Ignore the migrate if u2f_registration is not exist (go-gitea#18760)
  [skip ci] Updated translations via Crowdin
  Increase the size of the webauthn_credential credential_id field (go-gitea#18739)
  Fix isempty detection of git repository (go-gitea#18746)
Caellion added a commit to Caellion/gitea that referenced this pull request Feb 16, 2022
* 'main' of https://github.com/go-gitea/gitea: (87 commits)
  Fix template bug of LFS lock (go-gitea#18784)
  Various Mermaid improvements (go-gitea#18776)
  [skip ci] Updated translations via Crowdin
  Fix display time of milestones (go-gitea#18753)
  [skip ci] Updated translations via Crowdin
  Prevent dangling GetAttribute calls (go-gitea#18754)
  Add example to render html files (go-gitea#18736)
  Fix a broken link in `commits_list_small.tmpl` (go-gitea#18763)
  Fix broken cancel button link on patch page (go-gitea#18718)
  Ignore the migrate if u2f_registration is not exist (go-gitea#18760)
  [skip ci] Updated translations via Crowdin
  Increase the size of the webauthn_credential credential_id field 
(go-gitea#18739)
  Fix isempty detection of git repository (go-gitea#18746)
  [skip ci] Updated translations via Crowdin
  Send mail to issue/pr assignee/reviewer also when OnMention is set 
(go-gitea#18707)
  Reduce CI go module downloads, add make targets (go-gitea#18708)
  Add number in queue status to monitor page (go-gitea#18712)
  Fix source code line highlighting (go-gitea#18729)
  Fix forked repositories missed tags (go-gitea#18719)
  [skip ci] Updated translations via Crowdin
  ...
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
* Fix broken cacnel button link on patch page

* remove treepath="patch" elsewhere too

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: zeripath <art27@cantab.net>
@wxiaoguang wxiaoguang added this to the 1.17.0 milestone Mar 29, 2022
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
@lunny lunny deleted the lunny/fix_cancel_link branch August 24, 2023 11:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants