diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-02-14 17:18:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-14 09:18:55 +0000 |
| commit | 08fe6f8c7ee4b446ae489843414d237cf3e458b5 (patch) | |
| tree | 3856aa0af03cdf698e3ac7e069d7d2e50ea968b1 | |
| parent | 581a563cac5e910510f4f5cc54ccb4478193846f (diff) | |
| download | gitea-08fe6f8c7ee4b446ae489843414d237cf3e458b5.tar.gz gitea-08fe6f8c7ee4b446ae489843414d237cf3e458b5.zip | |
Fix broken cancel button link on patch page (#18718)
* 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>
| -rw-r--r-- | routers/web/repo/cherry_pick.go | 2 | ||||
| -rw-r--r-- | routers/web/repo/patch.go | 4 | ||||
| -rw-r--r-- | templates/repo/editor/patch.tmpl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/routers/web/repo/cherry_pick.go b/routers/web/repo/cherry_pick.go index 1b0d8452e2..eb22809348 100644 --- a/routers/web/repo/cherry_pick.go +++ b/routers/web/repo/cherry_pick.go @@ -50,7 +50,7 @@ func CherryPick(ctx *context.Context) { ctx.Data["RequireHighlightJS"] = true canCommit := renderCommitRights(ctx) - ctx.Data["TreePath"] = "patch" + ctx.Data["TreePath"] = "" if canCommit { ctx.Data["commit_choice"] = frmCommitChoiceDirect diff --git a/routers/web/repo/patch.go b/routers/web/repo/patch.go index b00065a6ee..e08cde89f2 100644 --- a/routers/web/repo/patch.go +++ b/routers/web/repo/patch.go @@ -28,7 +28,7 @@ func NewDiffPatch(ctx *context.Context) { canCommit := renderCommitRights(ctx) - ctx.Data["TreePath"] = "patch" + ctx.Data["TreePath"] = "" ctx.Data["commit_summary"] = "" ctx.Data["commit_message"] = "" @@ -55,7 +55,7 @@ func NewDiffPatchPost(ctx *context.Context) { branchName = form.NewBranchName } ctx.Data["RequireHighlightJS"] = true - ctx.Data["TreePath"] = "patch" + ctx.Data["TreePath"] = "" ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL() ctx.Data["FileContent"] = form.Content ctx.Data["commit_summary"] = form.CommitSummary diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index cecda907a4..c108d09159 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -15,7 +15,7 @@ <div class="divider">:</div> <a class="section" href="{{$.BranchLink}}">{{.BranchName}}</a> <span>{{.i18n.Tr "repo.editor.or"}} <a href="{{$.BranchLink}}">{{.i18n.Tr "repo.editor.cancel_lower"}}</a></span> - <input type="hidden" id="tree_path" name="tree_path" value="patch" required> + <input type="hidden" id="tree_path" name="tree_path" value="" required> <input id="file-name" type="hidden" value="diff.patch"> </div> </div> |