From 5b35193909b836d2bb89ebe0f3a80eecc37255ce Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 29 Jul 2022 18:41:51 +0200 Subject: [PATCH 1/2] hotfix #20106 --- routers/web/user/package.go | 16 ++++++++++ templates/user/overview/header.tmpl | 48 ++++++++++++++++++++++++----- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/routers/web/user/package.go b/routers/web/user/package.go index aa379152b30b1..59aaf07ff2a81 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -8,6 +8,7 @@ import ( "net/http" "code.gitea.io/gitea/models/db" + org_model "code.gitea.io/gitea/models/organization" packages_model "code.gitea.io/gitea/models/packages" container_model "code.gitea.io/gitea/models/packages/container" "code.gitea.io/gitea/models/perm" @@ -93,6 +94,21 @@ func ListPackages(ctx *context.Context) { ctx.Data["Total"] = total ctx.Data["RepositoryAccessMap"] = repositoryAccessMap + // TODO: context/org -> HandleOrgAssignment() can not be used + if ctx.ContextUser.IsOrganization() { + org := org_model.OrgFromUser(ctx.ContextUser) + ctx.Data["Org"] = org + ctx.Data["OrgLink"] = ctx.ContextUser.OrganisationLink() + + if ctx.Doer != nil { + ctx.Data["IsOrganizationMember"], _ = org_model.IsOrganizationMember(ctx, org.ID, ctx.Doer.ID) + ctx.Data["IsOrganizationOwner"], _ = org_model.IsOrganizationOwner(ctx, org.ID, ctx.Doer.ID) + } else { + ctx.Data["IsOrganizationMember"] = false + ctx.Data["IsOrganizationOwner"] = false + } + } + pager := context.NewPagination(int(total), setting.UI.PackagesPagingNum, page, 5) pager.AddParam(ctx, "q", "Query") pager.AddParam(ctx, "type", "PackageType") diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 8f9ad1d6ccfba..fb9de55be3d72 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,14 +1,22 @@
-
-
-
-
- {{avatar .ContextUser 32}} - {{.ContextUser.Name}} + + {{with .ContextUser}} +
+
+
+
+ {{avatar . 100}} + {{.DisplayName}} + + {{if .Visibility.IsLimited}}
{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}
{{end}} + {{if .Visibility.IsPrivate}}
{{$.i18n.Tr "org.settings.visibility.private_shortname"}}
{{end}} + +
-
+ {{end}} +
@@ -19,6 +27,32 @@ {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} {{end}} + + {{if .ContextUser.IsOrganization}} + {{if .IsOrganizationMember}} + + {{svg "octicon-organization"}} {{$.i18n.Tr "org.people"}} + {{if .NumMembers}} +
{{.NumMembers}}
+ {{end}} + + + {{svg "octicon-people"}} {{$.i18n.Tr "org.teams"}} + {{if .NumTeams}} +
{{.NumTeams}}
+ {{end}} + + {{end}} + + {{if .IsOrganizationOwner}} +
+ + {{svg "octicon-tools"}} {{.i18n.Tr "repo.settings"}} + +
+ {{end}} + {{end}} +
From 3e668cf97e0ad1751ae6cc16f358858c75423634 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 29 Jul 2022 18:45:06 +0200 Subject: [PATCH 2/2] ajust --- templates/user/overview/header.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index fb9de55be3d72..edd4375e08c39 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -8,8 +8,8 @@ {{avatar . 100}} {{.DisplayName}} - {{if .Visibility.IsLimited}}
{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .Visibility.IsPrivate}}
{{$.i18n.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .Visibility.IsLimited}}
{{$.locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} + {{if .Visibility.IsPrivate}}
{{$.locale.Tr "org.settings.visibility.private_shortname"}}
{{end}}
@@ -31,13 +31,13 @@ {{if .ContextUser.IsOrganization}} {{if .IsOrganizationMember}} - {{svg "octicon-organization"}} {{$.i18n.Tr "org.people"}} + {{svg "octicon-organization"}} {{$.locale.Tr "org.people"}} {{if .NumMembers}}
{{.NumMembers}}
{{end}} - {{svg "octicon-people"}} {{$.i18n.Tr "org.teams"}} + {{svg "octicon-people"}} {{$.locale.Tr "org.teams"}} {{if .NumTeams}}
{{.NumTeams}}
{{end}} @@ -47,7 +47,7 @@ {{if .IsOrganizationOwner}}
- {{svg "octicon-tools"}} {{.i18n.Tr "repo.settings"}} + {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
{{end}}