Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Allow forks to org if you can create repos (#17783)

Browse source
This commit is contained in:
qwerty287 2021-11-25 06:03:03 +01:00 committed by GitHub
parent 4b4997c73e
commit e0f81b4ef4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/repo.go
View file

@ -766,7 +766,7 @@ func CanUserForkRepo(user *user_model.User, repo *Repository) (bool, error) {
if repo.OwnerID != user.ID && !HasForkedRepo(user.ID, repo.ID) { if repo.OwnerID != user.ID && !HasForkedRepo(user.ID, repo.ID) {
return true, nil return true, nil
} }
ownedOrgs, err := GetOwnedOrgsByUserID(user.ID) ownedOrgs, err := GetOrgsCanCreateRepoByUserID(user.ID)
if err != nil { if err != nil {
return false, err return false, err
} }

12
routers/web/repo/pull.go
View file

@ -113,9 +113,9 @@ func getForkRepository(ctx *context.Context) *models.Repository {
ctx.Data["ForkRepo"] = forkRepo ctx.Data["ForkRepo"] = forkRepo
ownedOrgs, err := models.GetOwnedOrgsByUserID(ctx.User.ID) ownedOrgs, err := models.GetOrgsCanCreateRepoByUserID(ctx.User.ID)
if err != nil { if err != nil {
ctx.ServerError("GetOwnedOrgsByUserID", err) ctx.ServerError("GetOrgsCanCreateRepoByUserID", err)
return nil return nil
} }
var orgs []*models.Organization var orgs []*models.Organization
@ -216,13 +216,13 @@ func ForkPost(ctx *context.Context) {
} }
} }
// Check ownership of organization. // Check if user is allowed to create repo's on the organization.
if ctxUser.IsOrganization() { if ctxUser.IsOrganization() {
isOwner, err := models.OrgFromUser(ctxUser).IsOwnedBy(ctx.User.ID) isAllowedToFork, err := models.OrgFromUser(ctxUser).CanCreateOrgRepo(ctx.User.ID)
if err != nil { if err != nil {
ctx.ServerError("IsOwnedBy", err) ctx.ServerError("CanCreateOrgRepo", err)
return return
} else if !isOwner { } else if !isAllowedToFork {
ctx.Error(http.StatusForbidden) ctx.Error(http.StatusForbidden)
return return
} }