From c8a83ace59bb8f46c3611cef54f8f51977b30e52 Mon Sep 17 00:00:00 2001
From: Jimmy Praet <jimmy.praet@telenet.be>
Date: Sat, 7 May 2022 17:50:34 +0200
Subject: [PATCH] Only show accessible teams in dashboard dropdown list
(#19642) (#19645)
Fixes #19637
---
modules/context/org.go | 6 ------
templates/user/dashboard/navbar.tmpl | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/modules/context/org.go b/modules/context/org.go
index 824f22b2f3..8d82abbee1 100644
--- a/modules/context/org.go
+++ b/modules/context/org.go
@@ -70,12 +70,6 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
org := ctx.Org.Organization
ctx.Data["Org"] = org
- teams, err := org.LoadTeams()
- if err != nil {
- ctx.ServerError("LoadTeams", err)
- }
- ctx.Data["OrgTeams"] = teams
-
// Admin has super access.
if ctx.IsSigned && ctx.User.IsAdmin {
ctx.Org.IsOwner = true
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index e995db81d8..7127abeb0b 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -61,7 +61,7 @@
<a class="{{if not $.Team}}active selected{{end}} item" title="{{.i18n.Tr "all"}}" href="{{$.Org.OrganisationLink}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}">
{{.i18n.Tr "all"}}
</a>
- {{range .OrgTeams}}
+ {{range .Teams}}
{{if not .IncludesAllRepositories}}
<a class="{{if $.Team}}{{if eq $.Team.ID .ID}}active selected{{end}}{{end}} item" title="{{.Name}}" href="{{$.Org.OrganisationLink}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}/{{.Name}}">
{{.Name}}