Skip to content

Commit 420851c

Browse files
authored
Fix global packages enabled avaiable (#19276)
Fix #19275
1 parent c88547c commit 420851c

File tree

5 files changed

+32
-19
lines changed

5 files changed

+32
-19
lines changed

modules/context/org.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"code.gitea.io/gitea/models/organization"
1212
"code.gitea.io/gitea/models/perm"
1313
user_model "code.gitea.io/gitea/models/user"
14+
"code.gitea.io/gitea/modules/setting"
1415
)
1516

1617
// Organization contains organization context
@@ -119,6 +120,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
119120
}
120121
ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner
121122
ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember
123+
ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
122124
ctx.Data["IsPublicMember"] = func(uid int64) bool {
123125
is, _ := organization.IsPublicMembership(ctx.Org.Organization.ID, uid)
124126
return is

routers/web/user/profile.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ func Profile(ctx *context.Context) {
280280
pager.AddParam(ctx, "language", "Language")
281281
}
282282
ctx.Data["Page"] = pager
283+
ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
283284

284285
ctx.Data["ShowUserEmail"] = len(ctx.ContextUser.Email) > 0 && ctx.IsSigned && (!ctx.ContextUser.KeepEmailPrivate || ctx.ContextUser.ID == ctx.Doer.ID)
285286

routers/web/web.go

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,12 @@ func RegisterRoutes(m *web.Route) {
473473
m.Post("/delete", admin.DeleteRepo)
474474
})
475475

476-
m.Group("/packages", func() {
477-
m.Get("", admin.Packages)
478-
m.Post("/delete", admin.DeletePackageVersion)
479-
})
476+
if setting.Packages.Enabled {
477+
m.Group("/packages", func() {
478+
m.Get("", admin.Packages)
479+
m.Post("/delete", admin.DeletePackageVersion)
480+
})
481+
}
480482

481483
m.Group("/hooks", func() {
482484
m.Get("", admin.DefaultOrSystemWebhooks)
@@ -670,21 +672,23 @@ func RegisterRoutes(m *web.Route) {
670672
}, reqSignIn)
671673

672674
m.Group("/{username}/-", func() {
673-
m.Group("/packages", func() {
674-
m.Get("", user.ListPackages)
675-
m.Group("/{type}/{name}", func() {
676-
m.Get("", user.RedirectToLastVersion)
677-
m.Get("/versions", user.ListPackageVersions)
678-
m.Group("/{version}", func() {
679-
m.Get("", user.ViewPackageVersion)
680-
m.Get("/files/{fileid}", user.DownloadPackageFile)
681-
m.Group("/settings", func() {
682-
m.Get("", user.PackageSettings)
683-
m.Post("", bindIgnErr(forms.PackageSettingForm{}), user.PackageSettingsPost)
684-
}, reqPackageAccess(perm.AccessModeWrite))
675+
if setting.Packages.Enabled {
676+
m.Group("/packages", func() {
677+
m.Get("", user.ListPackages)
678+
m.Group("/{type}/{name}", func() {
679+
m.Get("", user.RedirectToLastVersion)
680+
m.Get("/versions", user.ListPackageVersions)
681+
m.Group("/{version}", func() {
682+
m.Get("", user.ViewPackageVersion)
683+
m.Get("/files/{fileid}", user.DownloadPackageFile)
684+
m.Group("/settings", func() {
685+
m.Get("", user.PackageSettings)
686+
m.Post("", bindIgnErr(forms.PackageSettingForm{}), user.PackageSettingsPost)
687+
}, reqPackageAccess(perm.AccessModeWrite))
688+
})
685689
})
686-
})
687-
}, context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
690+
}, context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
691+
}
688692
}, context_service.UserAssignmentWeb())
689693

690694
// ***** Release Attachment Download without Signin
@@ -973,7 +977,9 @@ func RegisterRoutes(m *web.Route) {
973977
m.Get("/milestones", reqRepoIssuesOrPullsReader, repo.Milestones)
974978
}, context.RepoRef())
975979

976-
m.Get("/packages", repo.Packages)
980+
if setting.Packages.Enabled {
981+
m.Get("/packages", repo.Packages)
982+
}
977983

978984
m.Group("/projects", func() {
979985
m.Get("", repo.Projects)

templates/org/menu.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<a class="{{if .PageIsViewRepositories}}active{{end}} item" href="{{$.Org.HomeLink}}">
44
{{svg "octicon-repo"}} {{.i18n.Tr "user.repositories"}}
55
</a>
6+
{{if .IsPackageEnabled}}
67
<a class="item" href="{{$.Org.HomeLink}}/-/packages">
78
{{svg "octicon-package"}} {{.i18n.Tr "packages.title"}}
89
</a>
10+
{{end}}
911
{{if .IsOrganizationMember}}
1012
<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
1113
{{svg "octicon-organization"}}&nbsp;{{$.i18n.Tr "org.people"}}

templates/user/profile.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,11 @@
8787
<a class='{{if and (ne .TabName "activity") (ne .TabName "following") (ne .TabName "followers") (ne .TabName "stars") (ne .TabName "watching") (ne .TabName "projects")}}active{{end}} item' href="{{.Owner.HomeLink}}">
8888
{{svg "octicon-repo"}} {{.i18n.Tr "user.repositories"}}
8989
</a>
90+
{{if .IsPackageEnabled}}
9091
<a class='{{if eq .TabName "packages"}}active{{end}} item' href="{{.Owner.HomeLink}}/-/packages">
9192
{{svg "octicon-package"}} {{.i18n.Tr "packages.title"}}
9293
</a>
94+
{{end}}
9395
<a class='{{if eq .TabName "activity"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=activity">
9496
{{svg "octicon-rss"}} {{.i18n.Tr "user.activity"}}
9597
</a>

0 commit comments

Comments
 (0)