Merge pull request #13742 from Cdiscount/feature/fix_ldap_server_admin

fix LDAP Grafana admin logic
2018-10-18 14:15:47 +02:00
parent d3c28a814a 781e66ba3c
commit 0f592679f9
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
+			}
 		}
 	}