From 2ae1675092ebe300ed88397a0eae5ca1b3a5443c Mon Sep 17 00:00:00 2001 From: Norwin <noerw@users.noreply.github.com> Date: Wed, 27 Jul 2022 13:58:21 +0200 Subject: [PATCH] Show hint to link package to repo when viewing empty repo package list (#20504) * show hint to link package to repo on empty repo package listing * reword --- options/locale/locale_en-US.ini | 1 + routers/web/repo/packages.go | 4 ++++ templates/package/shared/list.tmpl | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 566a7bd167..a97e2e2b3b 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3044,6 +3044,7 @@ title = Packages desc = Manage repository packages. empty = There are no packages yet. empty.documentation = For more information on the package registry, see <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/overview">the documentation</a>. +empty.repo = Did you upload a package, but it's not shown here? Go to <a href="%[1]s">package settings</a> and link it to this repo. filter.type = Type filter.type.all = All filter.no_result = Your filter produced no results. diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index d2d31ad57c..57db19aa32 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/packages" + "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" @@ -62,6 +63,9 @@ func Packages(ctx *context.Context) { ctx.Data["Query"] = query ctx.Data["PackageType"] = packageType ctx.Data["HasPackages"] = hasPackages + if ctx.Repo != nil { + ctx.Data["CanWritePackages"] = ctx.IsUserRepoWriter([]unit.Type{unit.TypePackages}) || ctx.IsUserSiteAdmin() + } ctx.Data["PackageDescriptors"] = pds ctx.Data["Total"] = total ctx.Data["RepositoryAccessMap"] = map[int64]bool{ctx.Repo.Repository.ID: true} // There is only the current repository diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 3b3a1720ea..189b75b59e 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -47,6 +47,10 @@ <div class="empty center"> {{svg "octicon-package" 32}} <h2>{{.locale.Tr "packages.empty"}}</h2> + {{if and .Repository .CanWritePackages}} + {{$packagesUrl := URLJoin .Owner.HTMLURL "-" "packages" }} + <p>{{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}</p> + {{end}} <p>{{.locale.Tr "packages.empty.documentation" | Safe}}</p> </div> {{else}}