Skip to content

Commit 0f894db

Browse files
committed
Fix to only use owned organizations
1 parent d13427d commit 0f894db

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

models/repo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,10 +642,10 @@ func (repo *Repository) CanUserFork(user *User) (bool, error) {
642642
if repo.OwnerID != user.ID && !user.HasForkedRepo(repo.ID) {
643643
return true, nil
644644
}
645-
if err := user.GetOrganizations(true); err != nil {
645+
if err := user.GetOwnedOrganizations(); err != nil {
646646
return false, err
647647
}
648-
for _, org := range user.Orgs {
648+
for _, org := range user.OwnedOrgs {
649649
if !org.HasForkedRepo(repo.ID) {
650650
return true, nil
651651
}

routers/repo/pull.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func getForkRepository(ctx *context.Context) *models.Repository {
6161
ctx.Data["repo_name"] = forkRepo.Name
6262
ctx.Data["description"] = forkRepo.Description
6363
ctx.Data["IsPrivate"] = forkRepo.IsPrivate
64-
canForkToUser := !ctx.User.HasForkedRepo(forkRepo.ID)
64+
canForkToUser := forkRepo.OwnerID != ctx.User.ID && !ctx.User.HasForkedRepo(forkRepo.ID)
6565
ctx.Data["CanForkToUser"] = canForkToUser
6666

6767
if err = forkRepo.GetOwner(); err != nil {
@@ -71,12 +71,12 @@ func getForkRepository(ctx *context.Context) *models.Repository {
7171
ctx.Data["ForkFrom"] = forkRepo.Owner.Name + "/" + forkRepo.Name
7272
ctx.Data["ForkFromOwnerID"] = forkRepo.Owner.ID
7373

74-
if err := ctx.User.GetOrganizations(true); err != nil {
75-
ctx.Handle(500, "GetOrganizations", err)
74+
if err := ctx.User.GetOwnedOrganizations(); err != nil {
75+
ctx.Handle(500, "GetOwnedOrganizations", err)
7676
return nil
7777
}
7878
var orgs []*models.User
79-
for _, org := range ctx.User.Orgs {
79+
for _, org := range ctx.User.OwnedOrgs {
8080
if !org.HasForkedRepo(forkRepo.ID) {
8181
orgs = append(orgs, org)
8282
}

0 commit comments

Comments
 (0)