diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-06 16:07:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-06 16:07:56 -0400 |
commit | b114062c1b8128fe650fce72454ba4f1fcbe5733 (patch) | |
tree | 0a51e9d1342bf89c435662c618d9aac5ba651b4b /webapp/components/admin_console/ldap_settings.jsx | |
parent | b1520d0b9458d1dab09d9e3e05dd7522fc28ba57 (diff) | |
download | chat-b114062c1b8128fe650fce72454ba4f1fcbe5733.tar.gz chat-b114062c1b8128fe650fce72454ba4f1fcbe5733.tar.bz2 chat-b114062c1b8128fe650fce72454ba4f1fcbe5733.zip |
PLT-3237 Update displayed config values in admin console after saving (#3506)
* Reloaded admin console data when settings are saved
* Fixed attempting to save an invalid config setting overwriting the stored config
Diffstat (limited to 'webapp/components/admin_console/ldap_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/ldap_settings.jsx | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx index dd7ceb07e..393e80f29 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/webapp/components/admin_console/ldap_settings.jsx @@ -19,28 +19,6 @@ export default class LdapSettings extends AdminSettings { this.getConfigFromState = this.getConfigFromState.bind(this); this.renderSettings = this.renderSettings.bind(this); - - this.state = Object.assign(this.state, { - enable: props.config.LdapSettings.Enable, - ldapServer: props.config.LdapSettings.LdapServer, - ldapPort: props.config.LdapSettings.LdapPort, - connectionSecurity: props.config.LdapSettings.ConnectionSecurity, - baseDN: props.config.LdapSettings.BaseDN, - bindUsername: props.config.LdapSettings.BindUsername, - bindPassword: props.config.LdapSettings.BindPassword, - userFilter: props.config.LdapSettings.UserFilter, - firstNameAttribute: props.config.LdapSettings.FirstNameAttribute, - lastNameAttribute: props.config.LdapSettings.LastNameAttribute, - nicknameAttribute: props.config.LdapSettings.NicknameAttribute, - emailAttribute: props.config.LdapSettings.EmailAttribute, - usernameAttribute: props.config.LdapSettings.UsernameAttribute, - idAttribute: props.config.LdapSettings.IdAttribute, - syncIntervalMinutes: props.config.LdapSettings.SyncIntervalMinutes, - skipCertificateVerification: props.config.LdapSettings.SkipCertificateVerification, - queryTimeout: props.config.LdapSettings.QueryTimeout, - maxPageSize: props.config.LdapSettings.MaxPageSize, - loginFieldName: props.config.LdapSettings.LoginFieldName - }); } getConfigFromState(config) { @@ -67,6 +45,30 @@ export default class LdapSettings extends AdminSettings { return config; } + getStateFromConfig(config) { + return { + enable: config.LdapSettings.Enable, + ldapServer: config.LdapSettings.LdapServer, + ldapPort: config.LdapSettings.LdapPort, + connectionSecurity: config.LdapSettings.ConnectionSecurity, + baseDN: config.LdapSettings.BaseDN, + bindUsername: config.LdapSettings.BindUsername, + bindPassword: config.LdapSettings.BindPassword, + userFilter: config.LdapSettings.UserFilter, + firstNameAttribute: config.LdapSettings.FirstNameAttribute, + lastNameAttribute: config.LdapSettings.LastNameAttribute, + nicknameAttribute: config.LdapSettings.NicknameAttribute, + emailAttribute: config.LdapSettings.EmailAttribute, + usernameAttribute: config.LdapSettings.UsernameAttribute, + idAttribute: config.LdapSettings.IdAttribute, + syncIntervalMinutes: config.LdapSettings.SyncIntervalMinutes, + skipCertificateVerification: config.LdapSettings.SkipCertificateVerification, + queryTimeout: config.LdapSettings.QueryTimeout, + maxPageSize: config.LdapSettings.MaxPageSize, + loginFieldName: config.LdapSettings.LoginFieldName + }; + } + renderTitle() { return ( <h3> |