From 3eb323901c6ec791294db492783e202558c2824f Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 21 May 2020 02:15:30 +0100 Subject: Fix repo-list private and total count bugs (#11500) * Fix repo-list private and total count bugs Signed-off-by: Andrew Thornton * Ensure limited and private org public repos are displayed on "private" Signed-off-by: Andrew Thornton * switch from onlyPrivate to is_private Signed-off-by: Andrew Thornton * Generate swagger Signed-off-by: Andrew Thornton Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> --- routers/api/v1/repo/repo.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'routers') diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index a724ebcc37..e5055daa2b 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -78,9 +78,9 @@ func Search(ctx *context.APIContext) { // in: query // description: include private repositories this user has access to (defaults to true) // type: boolean - // - name: onlyPrivate + // - name: is_private // in: query - // description: only include private repositories this user has access to (defaults to false) + // description: show only pubic, private or all repositories (defaults to all) // type: boolean // - name: template // in: query @@ -133,7 +133,6 @@ func Search(ctx *context.APIContext) { TopicOnly: ctx.QueryBool("topic"), Collaborate: util.OptionalBoolNone, Private: ctx.IsSigned && (ctx.Query("private") == "" || ctx.QueryBool("private")), - OnlyPrivate: ctx.IsSigned && ctx.QueryBool("onlyPrivate"), Template: util.OptionalBoolNone, StarredByID: ctx.QueryInt64("starredBy"), IncludeDescription: ctx.QueryBool("includeDesc"), @@ -169,6 +168,10 @@ func Search(ctx *context.APIContext) { opts.Archived = util.OptionalBoolOf(ctx.QueryBool("archived")) } + if ctx.Query("is_private") != "" { + opts.IsPrivate = util.OptionalBoolOf(ctx.QueryBool("is_private")) + } + var sortMode = ctx.Query("sort") if len(sortMode) > 0 { var sortOrder = ctx.Query("order") -- cgit v1.2.3