diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-19 19:41:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 19:41:40 +0800 |
| commit | 7a0347315995b25bcb2dca4786504fb699b5f004 (patch) | |
| tree | 803dfd39286216fd0521ad16539ffd9fc5f87fc0 /routers/api/v1/repo | |
| parent | a09b40de8d1dae7107437cfba42cee201fcd6d42 (diff) | |
| download | gitea-7a0347315995b25bcb2dca4786504fb699b5f004.tar.gz gitea-7a0347315995b25bcb2dca4786504fb699b5f004.zip | |
Use a standalone struct name for Organization (#17632)
* Use a standalone struct name for Organization
* recover unnecessary change
* make the code readable
* Fix template failure
* Fix template failure
* Move HasMemberWithUserID to org
* Fix test
* Remove unnecessary user type check
* Fix test
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'routers/api/v1/repo')
| -rw-r--r-- | routers/api/v1/repo/fork.go | 2 | ||||
| -rw-r--r-- | routers/api/v1/repo/migrate.go | 2 | ||||
| -rw-r--r-- | routers/api/v1/repo/repo.go | 6 | ||||
| -rw-r--r-- | routers/api/v1/repo/transfer.go | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/routers/api/v1/repo/fork.go b/routers/api/v1/repo/fork.go index b3504faad9..45d3c815a7 100644 --- a/routers/api/v1/repo/fork.go +++ b/routers/api/v1/repo/fork.go @@ -120,7 +120,7 @@ func CreateFork(ctx *context.APIContext) { ctx.Error(http.StatusForbidden, "isMemberNot", fmt.Sprintf("User is no Member of Organisation '%s'", org.Name)) return } - forker = org + forker = org.AsUser() } fork, err := repo_service.ForkRepository(ctx.User, forker, models.ForkRepoOptions{ diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go index 00390dfb5f..1880a88367 100644 --- a/routers/api/v1/repo/migrate.go +++ b/routers/api/v1/repo/migrate.go @@ -86,7 +86,7 @@ func Migrate(ctx *context.APIContext) { if repoOwner.IsOrganization() { // Check ownership of organization. - isOwner, err := repoOwner.IsOwnedBy(ctx.User.ID) + isOwner, err := models.OrgFromUser(repoOwner).IsOwnedBy(ctx.User.ID) if err != nil { ctx.Error(http.StatusInternalServerError, "IsOwnedBy", err) return diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 22f9da614d..872ce22871 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -393,7 +393,7 @@ func Generate(ctx *context.APIContext) { } if !ctx.User.IsAdmin { - canCreate, err := ctxUser.CanCreateOrgRepo(ctx.User.ID) + canCreate, err := models.OrgFromUser(ctxUser).CanCreateOrgRepo(ctx.User.ID) if err != nil { ctx.ServerError("CanCreateOrgRepo", err) return @@ -489,7 +489,7 @@ func CreateOrgRepo(ctx *context.APIContext) { return } - if !models.HasOrgOrUserVisible(org, ctx.User) { + if !models.HasOrgOrUserVisible(org.AsUser(), ctx.User) { ctx.NotFound("HasOrgOrUserVisible", nil) return } @@ -504,7 +504,7 @@ func CreateOrgRepo(ctx *context.APIContext) { return } } - CreateUserRepo(ctx, org, *opt) + CreateUserRepo(ctx, org.AsUser(), *opt) } // Get one repository diff --git a/routers/api/v1/repo/transfer.go b/routers/api/v1/repo/transfer.go index c13a2e4857..f16e2bb081 100644 --- a/routers/api/v1/repo/transfer.go +++ b/routers/api/v1/repo/transfer.go @@ -64,7 +64,7 @@ func Transfer(ctx *context.APIContext) { } if newOwner.Type == models.UserTypeOrganization { - if !ctx.User.IsAdmin && newOwner.Visibility == api.VisibleTypePrivate && !newOwner.HasMemberWithUserID(ctx.User.ID) { + if !ctx.User.IsAdmin && newOwner.Visibility == api.VisibleTypePrivate && !models.OrgFromUser(newOwner).HasMemberWithUserID(ctx.User.ID) { // The user shouldn't know about this organization ctx.Error(http.StatusNotFound, "", "The new owner does not exist or cannot be found") return @@ -78,7 +78,7 @@ func Transfer(ctx *context.APIContext) { return } - org := convert.ToOrganization(newOwner) + org := convert.ToOrganization(models.OrgFromUser(newOwner)) for _, tID := range *opts.TeamIDs { team, err := models.GetTeamByID(tID) if err != nil { |