Browse Source

#2251 fix button name

Unknwon 9 years ago
parent
commit
5ff6eedf5e
3 changed files with 8 additions and 3 deletions
  1. 6 1
      routers/repo/issue.go
  2. 1 1
      templates/repo/pulls/commits.tmpl
  3. 1 1
      templates/repo/pulls/files.tmpl

+ 6 - 1
routers/repo/issue.go

@@ -51,6 +51,8 @@ func MustEnablePulls(ctx *middleware.Context) {
 	if !ctx.Repo.Repository.EnablePulls {
 		ctx.Handle(404, "MustEnablePulls", nil)
 	}
+
+	ctx.Data["HasForkedRepo"] = ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)
 }
 
 func RetrieveLabels(ctx *middleware.Context) {
@@ -69,9 +71,12 @@ func RetrieveLabels(ctx *middleware.Context) {
 func Issues(ctx *middleware.Context) {
 	isPullList := ctx.Params(":type") == "pulls"
 	if isPullList {
+		MustEnablePulls(ctx)
+		if ctx.Written() {
+			return
+		}
 		ctx.Data["Title"] = ctx.Tr("repo.pulls")
 		ctx.Data["PageIsPullList"] = true
-		ctx.Data["HasForkedRepo"] = ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)
 
 	} else {
 		MustEnableIssues(ctx)

+ 1 - 1
templates/repo/pulls/commits.tmpl

@@ -5,7 +5,7 @@
 		<div class="navbar">
 			{{template "repo/issue/navbar" .}}
 			<div class="ui right">
-				<a class="ui green button" href="{{$.RepoLink}}/issues/new">{{.i18n.Tr "repo.issues.new"}}</a>
+				<a class="ui green button {{if not .HasForkedRepo}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName}}...{{.SignedUserName}}:{{.BranchName}}">{{.i18n.Tr "repo.pulls.new"}}</a>
 			</div>
 		</div>
 		<div class="ui divider"></div>

+ 1 - 1
templates/repo/pulls/files.tmpl

@@ -5,7 +5,7 @@
 		<div class="navbar">
 			{{template "repo/issue/navbar" .}}
 			<div class="ui right">
-				<a class="ui green button" href="{{$.RepoLink}}/issues/new">{{.i18n.Tr "repo.issues.new"}}</a>
+				<a class="ui green button {{if not .HasForkedRepo}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName}}...{{.SignedUserName}}:{{.BranchName}}">{{.i18n.Tr "repo.pulls.new"}}</a>
 			</div>
 		</div>
 		<div class="ui divider"></div>