From 63a912629d725dd96dad240e91e060ff97e2b941 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Fri, 24 Jan 2020 12:00:52 +0100 Subject: [PATCH] Admin: Viewer should not see link to teams in side menu (#21716) Fixes so that viewers don't see a link to teams in side menu when editors_can_admin setting is enabled. --- pkg/api/index.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/index.go b/pkg/api/index.go index 05741f18437..240aa8db782 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -275,7 +275,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er }) } - if c.OrgRole == m.ROLE_ADMIN || hs.Cfg.EditorsCanAdmin { + if c.OrgRole == m.ROLE_ADMIN || (hs.Cfg.EditorsCanAdmin && c.OrgRole == m.ROLE_EDITOR) { configNodes = append(configNodes, &dtos.NavLink{ Text: "Teams", Id: "teams",