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/custom_emoji_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/custom_emoji_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/custom_emoji_settings.jsx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/webapp/components/admin_console/custom_emoji_settings.jsx b/webapp/components/admin_console/custom_emoji_settings.jsx index 78661e16e..90b70241d 100644 --- a/webapp/components/admin_console/custom_emoji_settings.jsx +++ b/webapp/components/admin_console/custom_emoji_settings.jsx @@ -18,11 +18,6 @@ export default class CustomEmojiSettings extends AdminSettings { this.getConfigFromState = this.getConfigFromState.bind(this); this.renderSettings = this.renderSettings.bind(this); - - this.state = Object.assign(this.state, { - enableCustomEmoji: props.config.ServiceSettings.EnableCustomEmoji, - restrictCustomEmojiCreation: props.config.ServiceSettings.RestrictCustomEmojiCreation - }); } getConfigFromState(config) { @@ -35,6 +30,13 @@ export default class CustomEmojiSettings extends AdminSettings { return config; } + getStateFromConfig(config) { + return { + enableCustomEmoji: config.ServiceSettings.EnableCustomEmoji, + restrictCustomEmojiCreation: config.ServiceSettings.RestrictCustomEmojiCreation + }; + } + renderTitle() { return ( <h3> |