Backport 62658 to v9.4.x (#64545)
* Navigation: Fix Home logo always going to `/login` (#62658)
* only redirect to /login when anonymous access is disabled
* only search for dashboards when not logged in if anon access is enabled
* fix go logic
* add unit tests
(cherry picked from commit 3336327306)
* remove file i accidentally left in :/
* import correct method
This commit is contained in:
@@ -175,6 +175,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *contextmodel.ReqContext) (map[st
|
||||
"enabledFeatures": hs.License.EnabledFeatures(),
|
||||
},
|
||||
"featureToggles": hs.Features.GetEnabled(c.Req.Context()),
|
||||
"anonymousEnabled": hs.Cfg.AnonymousEnabled,
|
||||
"rendererAvailable": hs.RenderService.IsAvailable(c.Req.Context()),
|
||||
"rendererVersion": hs.RenderService.Version(),
|
||||
"secretsManagerPluginEnabled": secretsManagerPluginEnabled,
|
||||
|
||||
@@ -214,10 +214,14 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, hasEditPerm bool, p
|
||||
|
||||
func (s *ServiceImpl) getHomeNode(c *contextmodel.ReqContext, prefs *pref.Preference) *navtree.NavLink {
|
||||
homeUrl := s.cfg.AppSubURL + "/"
|
||||
homePage := s.cfg.HomePage
|
||||
if !c.IsSignedIn && !s.cfg.AnonymousEnabled {
|
||||
homeUrl = s.cfg.AppSubURL + "/login"
|
||||
} else {
|
||||
homePage := s.cfg.HomePage
|
||||
|
||||
if prefs.HomeDashboardID == 0 && len(homePage) > 0 {
|
||||
homeUrl = homePage
|
||||
if prefs.HomeDashboardID == 0 && len(homePage) > 0 {
|
||||
homeUrl = homePage
|
||||
}
|
||||
}
|
||||
|
||||
homeNode := &navtree.NavLink{
|
||||
|
||||
Reference in New Issue
Block a user