瀏覽代碼

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

Unknwon 7 年之前
父節點
當前提交
f89d948c06
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 1
      routes/repo/issue.go
  2. 1 1
      templates/repo/issue/view_content.tmpl

+ 2 - 1
routes/repo/issue.go

@@ -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"])
 	}
 

+ 1 - 1
templates/repo/issue/view_content.tmpl

@@ -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>