diff options
author | JakobDev <jakobdev@gmx.de> | 2023-08-11 19:08:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-11 13:08:05 -0400 |
commit | f3fbb7c67d21c01a58653c7ef9ae0e80dbb4becd (patch) | |
tree | 8989d303f376193c50db1eaec57caa1b89e33fff /routers/web/org | |
parent | 7e382a55558d4a8719e8493de5455883a2003759 (diff) | |
download | gitea-f3fbb7c67d21c01a58653c7ef9ae0e80dbb4becd.tar.gz gitea-f3fbb7c67d21c01a58653c7ef9ae0e80dbb4becd.zip |
Count only visible repos on profile (#25928)
Fixes #25914
Diffstat (limited to 'routers/web/org')
-rw-r--r-- | routers/web/org/home.go | 7 | ||||
-rw-r--r-- | routers/web/org/projects.go | 25 |
2 files changed, 32 insertions, 0 deletions
diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 7f38ec51ba..9104c15f94 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" + shared_user "code.gitea.io/gitea/routers/web/shared/user" ) const ( @@ -158,6 +159,12 @@ func Home(ctx *context.Context) { ctx.Data["PageIsViewRepositories"] = true ctx.Data["IsFollowing"] = isFollowing + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5) pager.SetDefaultParams(ctx) pager.AddParam(ctx, "language", "Language") diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index ea6e7dff48..34888f1550 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -101,6 +101,12 @@ func Projects(ctx *context.Context) { project.RenderedContent = project.Description } + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + numPages := 0 if total > 0 { numPages = (int(total) - 1/setting.UI.IssuePagingNum) @@ -135,6 +141,13 @@ func RenderNewProject(ctx *context.Context) { ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.Data["CancelLink"] = ctx.ContextUser.HomeLink() + "/-/projects" shared_user.RenderUserHeader(ctx) + + err := shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -270,6 +283,12 @@ func EditProjectPost(ctx *context.Context) { shared_user.RenderUserHeader(ctx) + err := shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + if ctx.HasError() { ctx.HTML(http.StatusOK, tplProjectsNew) return @@ -379,6 +398,12 @@ func ViewProject(ctx *context.Context) { ctx.Data["Boards"] = boards shared_user.RenderUserHeader(ctx) + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + ctx.HTML(http.StatusOK, tplProjectsView) } |