From 275dc1258119b4665e2649a320f1b759606d3c52 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 13 Sep 2023 01:30:15 +0530 Subject: [PATCH 1/3] Show the repo count in code tab on both user profile and org page --- routers/web/user/code.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 29b8b91c89ecd..49fe3c117db50 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -27,6 +27,16 @@ func CodeSearch(ctx *context.Context) { shared_user.PrepareContextForProfileBigAvatar(ctx) shared_user.RenderUserHeader(ctx) + var ( + repoIDs []int64 + err error + ) + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["Title"] = ctx.Tr("explore.code") @@ -47,11 +57,6 @@ func CodeSearch(ctx *context.Context) { return } - var ( - repoIDs []int64 - err error - ) - page := ctx.FormInt("page") if page <= 0 { page = 1 @@ -105,7 +110,6 @@ func CodeSearch(ctx *context.Context) { } ctx.Data["SearchResults"] = searchResults ctx.Data["SearchResultLanguages"] = searchResultLanguages - pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5) pager.SetDefaultParams(ctx) pager.AddParam(ctx, "l", "Language") From d1847d09e05227433e880b67d335ff62bfbbf7fd Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 13 Sep 2023 11:05:43 +0530 Subject: [PATCH 2/3] Not touching the old code and add err variable to local scope --- routers/web/user/code.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 49fe3c117db50..048333b4adafe 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -27,12 +27,7 @@ func CodeSearch(ctx *context.Context) { shared_user.PrepareContextForProfileBigAvatar(ctx) shared_user.RenderUserHeader(ctx) - var ( - repoIDs []int64 - err error - ) - err = shared_user.LoadHeaderCount(ctx) - if err != nil { + if err := shared_user.LoadHeaderCount(ctx); err != nil { ctx.ServerError("LoadHeaderCount", err) return } @@ -57,6 +52,11 @@ func CodeSearch(ctx *context.Context) { return } + var ( + repoIDs []int64 + err error + ) + page := ctx.FormInt("page") if page <= 0 { page = 1 From a19ab838c15e3e838c3399fcd59767fb9430e279 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 13 Sep 2023 13:39:44 +0800 Subject: [PATCH 3/3] revert empty line --- routers/web/user/code.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 048333b4adafe..42d7284189bb0 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -110,6 +110,7 @@ func CodeSearch(ctx *context.Context) { } ctx.Data["SearchResults"] = searchResults ctx.Data["SearchResultLanguages"] = searchResultLanguages + pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5) pager.SetDefaultParams(ctx) pager.AddParam(ctx, "l", "Language")