IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

only render direct children on the landing page routes (#56720)

Browse Source
This commit is contained in:
Ashley Harrison
2022-10-12 10:01:33 +01:00
committed by GitHub
parent 26bb139470
commit dd9e1498f9
5 changed files with 10 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/navtree/models.go
View File

@@ -115,8 +115,7 @@ func (root *NavTreeRoot) RemoveEmptySectionsAndApplyNewInformationArchitecture(t
}
if serverAdminNode := root.FindById(NavIDAdmin); serverAdminNode != nil {
serverAdminNode.Url = "/admin/settings"
serverAdminNode.Text = "Server admin"
serverAdminNode.Url = "/admin/server"
serverAdminNode.SortWeight = 0
if orgAdminNode != nil {

6
pkg/services/navtree/navtreeimpl/admin.go
View File

@@ -171,7 +171,11 @@ func (s *ServiceImpl) getServerAdminNode(c *models.ReqContext) *navtree.NavLink
}
if len(adminNavLinks) > 0 {
adminNode.Url = adminNavLinks[0].Url
if s.cfg.IsFeatureToggleEnabled(featuremgmt.FlagTopnav) {
adminNode.Url = s.cfg.AppSubURL + "/admin/server"
} else {
adminNode.Url = adminNavLinks[0].Url
}
}
return adminNode