Przeglądaj źródła

fix(ldap): fix for ldap users with empty email address, fixes #2461

Torkel Ödegaard 10 lat temu
rodzic
commit
90400bf5ad
2 zmienionych plików z 5 dodań i 0 usunięć
  1. 1 0
      CHANGELOG.md
  2. 4 0
      pkg/services/sqlstore/user.go

+ 1 - 0
CHANGELOG.md

@@ -5,6 +5,7 @@
 - [Issue #2442](https://github.com/grafana/grafana/issues/2442). Templating: Fix text panel when using template variables in text in in repeated panel
 - [Issue #2446](https://github.com/grafana/grafana/issues/2446). InfluxDB: Fix for using template vars inside alias field (InfluxDB 0.9)
 - [Issue #2460](https://github.com/grafana/grafana/issues/2460). SinglestatPanel: Fix to handle series with no data points
+- [Issue #2461](https://github.com/grafana/grafana/issues/2461). LDAP: Fix for ldap users with empty email address
 
 # 2.1.0 (2015-08-04)
 

+ 4 - 0
pkg/services/sqlstore/user.go

@@ -72,6 +72,10 @@ func CreateUser(cmd *m.CreateUserCommand) error {
 			return err
 		}
 
+		if cmd.Email == "" {
+			cmd.Email = cmd.Login
+		}
+
 		// create user
 		user := m.User{
 			Email:   cmd.Email,