fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-19 04:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Fixes #19637
This commit is contained in:
Jimmy Praet 2022-05-07 17:49:43 +02:00 committed by GitHub
parent 672e5a752d
commit 38d72d40f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/context/org.go
View file

@ -72,12 +72,6 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
ctx.ContextUser = org.AsUser() ctx.ContextUser = org.AsUser()
ctx.Data["Org"] = org ctx.Data["Org"] = org
teams, err := org.LoadTeams()
if err != nil {
ctx.ServerError("LoadTeams", err)
}
ctx.Data["OrgTeams"] = teams
// Admin has super access. // Admin has super access.
if ctx.IsSigned && ctx.Doer.IsAdmin { if ctx.IsSigned && ctx.Doer.IsAdmin {
ctx.Org.IsOwner = true ctx.Org.IsOwner = true

2
templates/user/dashboard/navbar.tmpl
View file

@ -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}}"> <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"}} {{.i18n.Tr "all"}}
</a> </a>
{{range .OrgTeams}} {{range .Teams}}
{{if not .IncludesAllRepositories}} {{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}}"> <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}} {{.Name}}