File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -642,10 +642,10 @@ func (repo *Repository) CanUserFork(user *User) (bool, error) {
642
642
if repo .OwnerID != user .ID && ! user .HasForkedRepo (repo .ID ) {
643
643
return true , nil
644
644
}
645
- if err := user .GetOrganizations ( true ); err != nil {
645
+ if err := user .GetOwnedOrganizations ( ); err != nil {
646
646
return false , err
647
647
}
648
- for _ , org := range user .Orgs {
648
+ for _ , org := range user .OwnedOrgs {
649
649
if ! org .HasForkedRepo (repo .ID ) {
650
650
return true , nil
651
651
}
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ func getForkRepository(ctx *context.Context) *models.Repository {
61
61
ctx .Data ["repo_name" ] = forkRepo .Name
62
62
ctx .Data ["description" ] = forkRepo .Description
63
63
ctx .Data ["IsPrivate" ] = forkRepo .IsPrivate
64
- canForkToUser := ! ctx .User .HasForkedRepo (forkRepo .ID )
64
+ canForkToUser := forkRepo . OwnerID != ctx . User . ID && ! ctx .User .HasForkedRepo (forkRepo .ID )
65
65
ctx .Data ["CanForkToUser" ] = canForkToUser
66
66
67
67
if err = forkRepo .GetOwner (); err != nil {
@@ -71,12 +71,12 @@ func getForkRepository(ctx *context.Context) *models.Repository {
71
71
ctx .Data ["ForkFrom" ] = forkRepo .Owner .Name + "/" + forkRepo .Name
72
72
ctx .Data ["ForkFromOwnerID" ] = forkRepo .Owner .ID
73
73
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 )
76
76
return nil
77
77
}
78
78
var orgs []* models.User
79
- for _ , org := range ctx .User .Orgs {
79
+ for _ , org := range ctx .User .OwnedOrgs {
80
80
if ! org .HasForkedRepo (forkRepo .ID ) {
81
81
orgs = append (orgs , org )
82
82
}
You can’t perform that action at this time.
0 commit comments