Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

Merge branch 'develop' into oath-poc

Browse source
This commit is contained in:
Anthony Lapenna 2019-02-04 09:19:12 +13:00
commit 508352f4ea
53 changed files with 626 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

5
api/http/handler/settings/settings_update.go
View file

@ -67,7 +67,12 @@ func (handler *Handler) settingsUpdate(w http.ResponseWriter, r *http.Request) *
}
if payload.LDAPSettings != nil {
ldapPassword := settings.LDAPSettings.Password
if payload.LDAPSettings.Password != "" {
ldapPassword = payload.LDAPSettings.Password
}
settings.LDAPSettings = *payload.LDAPSettings
settings.LDAPSettings.Password = ldapPassword
}
if payload.OAuthSettings != nil {