IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-08-07 10:14:36 +02:00
parent c43f2bbb86
commit 90400bf5ad
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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 #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 #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 #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) # 2.1.0 (2015-08-04)

4
pkg/services/sqlstore/user.go
View File

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