Pārlūkot izejas kodu

Keep path when creating a new branch (#21153)

If you are create a new new branch while viewing file or directory, you
get redirected to the root of the repo. With this PR, you keep your
current path instead of getting redirected to the repo root.
tags/v1.18.0-rc0
JakobDev pirms 1 gada
vecāks
revīzija
bf325d4412
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam

+ 1
- 1
routers/web/repo/branch.go Parādīt failu

@@ -427,5 +427,5 @@ func CreateBranch(ctx *context.Context) {
}

ctx.Flash.Success(ctx.Tr("repo.branch.create_success", form.NewBranchName))
ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(form.NewBranchName))
ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(form.NewBranchName) + "/" + util.PathEscapeSegments(form.CurrentPath))
}

+ 1
- 0
services/forms/repo_branch_form.go Parādīt failu

@@ -16,6 +16,7 @@ import (
// NewBranchForm form for creating a new branch
type NewBranchForm struct {
NewBranchName string `binding:"Required;MaxSize(100);GitRefName"`
CurrentPath string
CreateTag bool
}


+ 3
- 0
templates/repo/branch_dropdown.tmpl Parādīt failu

@@ -94,6 +94,9 @@
{{.root.CsrfTokenHtml}}
<input type="hidden" name="new_branch_name" v-model="searchTerm">
<input type="hidden" name="create_tag" v-model="createTag">
{{if $.root.TreePath}}
<input type="hidden" name="current_path" value="{{.root.TreePath}}">
{{end}}
</form>
</div>
</div>

Notiek ielāde…
Atcelt
Saglabāt