From a5df817306af637a26db7aba12b53bc85cab0e9a Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Mon, 21 Feb 2022 14:46:43 +0100 Subject: [PATCH 1/2] Fix page and missing return on unadopted repos API Page must be 1 if it's not specified and it should return after sending an internal server error. --- integrations/api_repo_test.go | 1 - models/migrations/migrations.go | 1 - models/migrations/v210.go | 2 +- models/migrations/v210_test.go | 1 + routers/api/v1/admin/adopt.go | 4 ++++ 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/integrations/api_repo_test.go b/integrations/api_repo_test.go index 52764a3a6909e..ce1ecb1d43d8a 100644 --- a/integrations/api_repo_test.go +++ b/integrations/api_repo_test.go @@ -468,7 +468,6 @@ func TestAPIRepoTransfer(t *testing.T) { expectedStatus int }{ // Disclaimer for test story: "user1" is an admin, "user2" is normal user and part of in owner team of org "user3" - // Transfer to a user with teams in another org should fail {ctxUserID: 1, newOwner: "user3", teams: &[]int64{5}, expectedStatus: http.StatusForbidden}, // Transfer to a user with non-existent team IDs should fail diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 63d1c32259964..31b172a68d66f 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -61,7 +61,6 @@ type Version struct { // update minDBVersion accordingly var migrations = []Migration{ // Gitea 1.5.0 ends at v69 - // v70 -> v71 NewMigration("add issue_dependencies", addIssueDependencies), // v71 -> v72 diff --git a/models/migrations/v210.go b/models/migrations/v210.go index cf50760b92c33..9da8ca9db6643 100644 --- a/models/migrations/v210.go +++ b/models/migrations/v210.go @@ -11,8 +11,8 @@ import ( "strings" "code.gitea.io/gitea/modules/timeutil" - "github.com/tstranex/u2f" + "github.com/tstranex/u2f" "xorm.io/xorm" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v210_test.go b/models/migrations/v210_test.go index 3e10b3ce80a25..70dbe61b06eb7 100644 --- a/models/migrations/v210_test.go +++ b/models/migrations/v210_test.go @@ -8,6 +8,7 @@ import ( "testing" "code.gitea.io/gitea/modules/timeutil" + "github.com/stretchr/testify/assert" "xorm.io/xorm/schemas" ) diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go index 1c0e237cdb1f5..b3593df34e7d3 100644 --- a/routers/api/v1/admin/adopt.go +++ b/routers/api/v1/admin/adopt.go @@ -43,9 +43,13 @@ func ListUnadoptedRepositories(ctx *context.APIContext) { // "$ref": "#/responses/forbidden" listOptions := utils.GetListOptions(ctx) + if listOptions.Page <= 0 { + listOptions.Page = 1 + } repoNames, count, err := repo_service.ListUnadoptedRepositories(ctx.FormString("query"), &listOptions) if err != nil { ctx.InternalServerError(err) + return } ctx.SetTotalCountHeader(int64(count)) From 95793162e00d40985dee516d59ba43adb8ed4706 Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Sat, 26 Feb 2022 14:33:09 +0100 Subject: [PATCH 2/2] Allow ignore pages --- routers/api/v1/admin/adopt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go index b3593df34e7d3..db1754c8d0f0a 100644 --- a/routers/api/v1/admin/adopt.go +++ b/routers/api/v1/admin/adopt.go @@ -43,7 +43,7 @@ func ListUnadoptedRepositories(ctx *context.APIContext) { // "$ref": "#/responses/forbidden" listOptions := utils.GetListOptions(ctx) - if listOptions.Page <= 0 { + if listOptions.Page == 0 { listOptions.Page = 1 } repoNames, count, err := repo_service.ListUnadoptedRepositories(ctx.FormString("query"), &listOptions)