resolved #310: hide fork to self (#323)

lunny · web-flow · commit 2343feadd434 · 2016-12-01T18:51:50.000+08:00
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
@@ -62,6 +62,7 @@ func getForkRepository(ctx *context.Context) *models.Repository {
 		return nil
 	}
 	ctx.Data["ForkFrom"] = forkRepo.Owner.Name + "/" + forkRepo.Name
+	ctx.Data["ForkFromOwnerID"] = forkRepo.Owner.ID
 
 	if err := ctx.User.GetOrganizations(true); err != nil {
 		ctx.Handle(500, "GetOrganizations", err)
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl
@@ -24,7 +24,7 @@
 									{{.SignedUser.ShortName 20}}
 								</div>
 								{{range .Orgs}}
-									{{if .IsOwnedBy $.SignedUser.ID}}
+									{{if and (.IsOwnedBy $.SignedUser.ID) (ne .ID $.ForkFromOwnerID)}}
 										<div class="item" data-value="{{.ID}}">
 											<img class="ui mini image" src="{{.RelAvatarLink}}">
 											{{.ShortName 20}}

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ func getForkRepository(ctx context.Context) models.Repository {`
`62`	`62`	`return nil`
`63`	`63`	`}`
`64`	`64`	`ctx.Data["ForkFrom"] = forkRepo.Owner.Name + "/" + forkRepo.Name`
	`65`	`+ ctx.Data["ForkFromOwnerID"] = forkRepo.Owner.ID`
`65`	`66`
`66`	`67`	`if err := ctx.User.GetOrganizations(true); err != nil {`
`67`	`68`	`ctx.Handle(500, "GetOrganizations", err)`