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

tokarchuk/v1.17
Lunny Xiao 8 years ago committed by GitHub
parent 31950cb262
commit 2343feadd4
  1. 1
      routers/repo/pull.go
  2. 2
      templates/repo/pulls/fork.tmpl

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

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

Loading…
Cancel
Save