USEFULL/gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-05-31 11:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

templates/repo/issue: rework escape delete branch link after merged pull request (#4601)

Browse Source
This commit is contained in:
Unknwon 2018-04-16 23:08:09 -04:00
parent 45a0988833
commit f89d948c06
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
routes/repo/issue.go
View File

@ -23,6 +23,7 @@ import (
"github.com/gogits/gogs/pkg/form"
"github.com/gogits/gogs/pkg/markup"
"github.com/gogits/gogs/pkg/setting"
"github.com/gogits/gogs/pkg/template"
"github.com/gogits/gogs/pkg/tool"
)
@ -657,7 +658,7 @@ func viewIssue(c *context.Context, isPullList bool) {
c.Repo.IsWriter() && c.Repo.GitRepo.IsBranchExist(pull.HeadBranch) &&
!branchProtected
deleteBranchUrl := c.Repo.RepoLink + "/branches/delete/" + pull.HeadBranch
deleteBranchUrl := template.EscapePound(c.Repo.RepoLink + "/branches/delete/" + pull.HeadBranch)
c.Data["DeleteBranchLink"] = fmt.Sprintf("%s?commit=%s&redirect_to=%s", deleteBranchUrl, pull.MergedCommitID, c.Data["Link"])
}

2
templates/repo/issue/view_content.tmpl
View File

@ -165,7 +165,7 @@
{{if .IsPullBranchDeletable}}
<div class="ui divider"></div>
<div>
<form class="ui form" action="{{EscapePound .DeleteBranchLink}}" method="post">
<form class="ui form" action="{{.DeleteBranchLink}}" method="post">
{{.CSRFTokenHTML}}
<button class="ui red button">{{$.i18n.Tr "repo.pulls.delete_branch"}}</button>
</form>