Fix repo count in org action settings (#27245) (#27353)

Backport #27245 by @yp05327

Only in org action settings, repo count is missing

Before:

![image](https://github.com/go-gitea/gitea/assets/18380374/4a74c090-c55f-4f06-810a-c390337efa9d)

![image](https://github.com/go-gitea/gitea/assets/18380374/e234f7e7-178c-4186-bbc0-0f291192b011)

![image](https://github.com/go-gitea/gitea/assets/18380374/c1db70cd-973b-40d5-ba17-1f354aed9149)
In other setting page:

![image](https://github.com/go-gitea/gitea/assets/18380374/43bfec6b-a1a4-48a9-8280-ab6f967b7ec4)

After:

![image](https://github.com/go-gitea/gitea/assets/18380374/9a697bd8-ce9f-40e2-8749-b46726d68d84)

![image](https://github.com/go-gitea/gitea/assets/18380374/3b6d1e59-64dd-4655-953b-064718e6aa7a)

![image](https://github.com/go-gitea/gitea/assets/18380374/5604c063-556c-4252-8778-4e5a5e23b7e1)

Co-authored-by: yp05327 <576951401@qq.com>

diff --git a/routers/web/repo/setting/runners.go b/routers/web/repo/setting/runners.go
index 2c192e9790a6908b582cdbfce0ed6a9421db763d..8d4112c157b41ce933cb459f3a1601cedec6b265 100644 (file)
--- a/routers/web/repo/setting/runners.go
+++ b/routers/web/repo/setting/runners.go
@@ -14,6 +14,7 @@ import (
        "code.gitea.io/gitea/modules/context"
        "code.gitea.io/gitea/modules/setting"
        actions_shared "code.gitea.io/gitea/routers/web/shared/actions"
+       shared_user "code.gitea.io/gitea/routers/web/shared/user"
 )
 
 const (
@@ -53,6 +54,11 @@ func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) {
        }
 
        if ctx.Data["PageIsOrgSettings"] == true {
+               err := shared_user.LoadHeaderCount(ctx)
+               if err != nil {
+                       ctx.ServerError("LoadHeaderCount", err)
+                       return nil, nil
+               }
                return &runnersCtx{
                        RepoID:             0,
                        OwnerID:            ctx.Org.Organization.ID,

diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go
index 3d7a0576027e971bdb6fda01d37d4eb8630e4953..cf427b2c44bd76d1928ee492bdab7849c47a7fd3 100644 (file)
--- a/routers/web/repo/setting/secrets.go
+++ b/routers/web/repo/setting/secrets.go
@@ -11,6 +11,7 @@ import (
        "code.gitea.io/gitea/modules/context"
        "code.gitea.io/gitea/modules/setting"
        shared "code.gitea.io/gitea/routers/web/shared/secrets"
+       shared_user "code.gitea.io/gitea/routers/web/shared/user"
 )
 
 const (
@@ -42,6 +43,11 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) {
        }
 
        if ctx.Data["PageIsOrgSettings"] == true {
+               err := shared_user.LoadHeaderCount(ctx)
+               if err != nil {
+                       ctx.ServerError("LoadHeaderCount", err)
+                       return nil, nil
+               }
                return &secretsCtx{
                        OwnerID:         ctx.ContextUser.ID,
                        RepoID:          0,

diff --git a/routers/web/repo/setting/variables.go b/routers/web/repo/setting/variables.go
index 1005d1d9c61068cd01e713c32bb010c424d0dd9a..a697a5d8d857fe2d3a3146799f35897e545780ef 100644 (file)
--- a/routers/web/repo/setting/variables.go
+++ b/routers/web/repo/setting/variables.go
@@ -11,6 +11,7 @@ import (
        "code.gitea.io/gitea/modules/context"
        "code.gitea.io/gitea/modules/setting"
        shared "code.gitea.io/gitea/routers/web/shared/actions"
+       shared_user "code.gitea.io/gitea/routers/web/shared/user"
 )
 
 const (
@@ -40,6 +41,11 @@ func getVariablesCtx(ctx *context.Context) (*variablesCtx, error) {
        }
 
        if ctx.Data["PageIsOrgSettings"] == true {
+               err := shared_user.LoadHeaderCount(ctx)
+               if err != nil {
+                       ctx.ServerError("LoadHeaderCount", err)
+                       return nil, nil
+               }
                return &variablesCtx{
                        OwnerID:           ctx.ContextUser.ID,
                        IsOrg:             true,