From 8017f5dcbf5c278dd1ac7f744734fced306516e2 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 7 Apr 2026 16:11:40 +0800 Subject: [PATCH] fine tune --- models/repo/org_repo.go | 11 ++++++----- routers/api/v1/org/org.go | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/models/repo/org_repo.go b/models/repo/org_repo.go index 82951fc2e7..d8c2c91fec 100644 --- a/models/repo/org_repo.go +++ b/models/repo/org_repo.go @@ -18,13 +18,14 @@ import ( // GetOrgRepositories get repos belonging to the given organization func GetOrgRepositories(ctx context.Context, orgID int64) (RepositoryList, error) { var orgRepos []*Repository - return orgRepos, db.GetEngine(ctx).Where("owner_id = ?", orgID).Find(&orgRepos) + err := db.GetEngine(ctx).Where("owner_id = ?", orgID).Find(&orgRepos) + return orgRepos, err } // GetOrgRepositoryIDs get repo IDs belonging to the given organization -func GetOrgRepositoryIDs(ctx context.Context, orgID int64) ([]int64, error) { - var repoIDs []int64 - return repoIDs, db.GetEngine(ctx).Table("repository").Where("owner_id = ?", orgID).Cols("id").Find(&repoIDs) +func GetOrgRepositoryIDs(ctx context.Context, orgID int64) (repoIDs []int64, _ error) { + err := db.GetEngine(ctx).Table("repository").Where("owner_id = ?", orgID).Cols("id").Find(&repoIDs) + return repoIDs, err } type SearchTeamRepoOptions struct { @@ -32,7 +33,7 @@ type SearchTeamRepoOptions struct { TeamID int64 } -// GetRepositories returns paginated repositories in team of organization. +// GetTeamRepositories returns paginated repositories in team of organization. func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) (RepositoryList, error) { sess := db.GetEngine(ctx) if opts.TeamID > 0 { diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 969ecccc11..7c6d11bbc4 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -566,7 +566,7 @@ func DeleteOrgRepos(ctx *context.APIContext) { return } - // Start deletion in background with detached context + // Start deletion (slow) in background with detached context, so it can continue even if the request is canceled go deleteOrgReposBackground(graceful.GetManager().ShutdownContext(), ctx.Org.Organization, repoIDs, ctx.Doer) ctx.Status(http.StatusAccepted)