Merge pull request #13742 from Cdiscount/feature/fix_ldap_server_admin

fix LDAP Grafana admin logic

Merge pull request #13742 from Cdiscount/feature/fix_ldap_server_admin
fix LDAP Grafana admin logic
0f592679 · Torkel Ödegaard · GitHub · d3c28a81 · 781e66ba · 0f592679
Commit 0f592679 authored Oct 18, 2018 by Torkel Ödegaard Committed by GitHub Oct 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

pkg/login/ldap.go
+3 -1

No files found.
--- a/pkg/login/ldap.go
+++ b/pkg/login/ldap.go
@@ -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
+			}
 		}
 	}