Revert "Fix to the new pull request button"

This reverts commit 90733f3.
go-gitea · Mar 5, 2019 · f1e0be6 · f1e0be6
1 parent 90733f3
commit f1e0be6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -73,4 +73,3 @@ prime/
 *.snap
 *.snap-build
 *_source.tar.bz2
-/.vs
diff --git a/modules/context/repo.go b/modules/context/repo.go
@@ -367,8 +367,6 @@ func RepoAssignment() macaron.Handler {
 		ctx.Data["CanWriteCode"] = ctx.Repo.CanWrite(models.UnitTypeCode)
 		ctx.Data["CanWriteIssues"] = ctx.Repo.CanWrite(models.UnitTypeIssues)
 		ctx.Data["CanWritePulls"] = ctx.Repo.CanWrite(models.UnitTypePullRequests)
-		ctx.Data["HasForkedRepo"] = ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)
-
 
 		if ctx.Data["CanSignedUserFork"], err = ctx.Repo.Repository.CanUserFork(ctx.User); err != nil {
 			ctx.ServerError("CanUserFork", err)

diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
@@ -64,7 +64,7 @@
 			{{if eq $n 0}}
 				{{if and .PullRequestCtx.Allowed .IsViewBranch (not .Repository.IsArchived)}}
 					<div class="fitted item">
-							<a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch | EscapePound}}...{{ if or .HasForkedRepo (.Repository.IsFork) }}{{ .SignedUserName }}:{{ end }}{{.BranchName | EscapePound}}">
+						<a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch | EscapePound}}...{{if ne .Repository.Owner.Name .BaseRepo.Owner.Name}}{{.Repository.Owner.Name}}:{{end}}{{.BranchName | EscapePound}}">
 							<button id="new-pull-request" class="ui compact basic button">{{.i18n.Tr "repo.pulls.compare_changes"}}</button>
 						</a>
 					</div>