Only show accessible teams in dashboard dropdown list (#19642) Fixes #19637

Changes

2 changed files (+1/-7)

• modules/context/org.go
  • @@ -72,12 +72,6 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
    ctx.ContextUser = org.AsUser() 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.Doer.IsAdmin { ctx.Org.IsOwner = true
• 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}}