fix LDAP Grafana admin logic

Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com> Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com> (cherry picked from commit 781e66ba3c)
2018-10-23 11:18:04 +02:00
parent 02a3e11708
commit e8e8b014f6
1 changed files with 3 additions and 1 deletions
@@ -185,7 +185,9 @@ func (a *ldapAuther) GetGrafanaUserFor(ctx *m.ReqContext, ldapUser *LdapUserInfo

 		if ldapUser.isMemberOf(group.GroupDN) {
 			extUser.OrgRoles[group.OrgId] = group.OrgRole
-			extUser.IsGrafanaAdmin = group.IsGrafanaAdmin
+			if extUser.IsGrafanaAdmin == nil || *extUser.IsGrafanaAdmin == false {
+				extUser.IsGrafanaAdmin = group.IsGrafanaAdmin
+			}
 		}
 	}