minor fix for #1961

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 639117b8c35c789d682ad1c16d2132ee27046986..cf6687fe9c2eb64388f738989117d330c811a55d 100644 (file)
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -494,6 +494,7 @@ func ViewIssue(ctx *middleware.Context) {
 
                ctx.Data["PageIsPullList"] = true
                ctx.Data["PageIsPullConversation"] = true
+               ctx.Data["HasForkedRepo"] = ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)
        } else {
                ctx.Data["PageIsIssueList"] = true
        }

diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index dff8910b88e6f440826cab77ba050bf25c2b8749..506e4e3f04943feecf3fd9a6357851af7119b050 100644 (file)
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -5,7 +5,11 @@
                <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>
+                               {{if .PageIsIssueList}}
+                               <a class="ui green button" href="{{.RepoLink}}/issues/new">{{.i18n.Tr "repo.issues.new"}}</a>
+                               {{else}}
+                               <a class="ui green button {{if not .HasForkedRepo}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName}}...{{.SignedUserName}}:{{.BranchName}}">{{.i18n.Tr "repo.pulls.new"}}</a>
+                               {{end}}
                        </div>
                </div>
                <div class="ui divider"></div>