summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/storage_settings.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-07-06 16:07:56 -0400
committerGitHub <noreply@github.com>2016-07-06 16:07:56 -0400
commitb114062c1b8128fe650fce72454ba4f1fcbe5733 (patch)
tree0a51e9d1342bf89c435662c618d9aac5ba651b4b /webapp/components/admin_console/storage_settings.jsx
parentb1520d0b9458d1dab09d9e3e05dd7522fc28ba57 (diff)
downloadchat-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/storage_settings.jsx')
-rw-r--r--webapp/components/admin_console/storage_settings.jsx22
1 files changed, 12 insertions, 10 deletions
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx
index a3d4122b5..f58541f02 100644
--- a/webapp/components/admin_console/storage_settings.jsx
+++ b/webapp/components/admin_console/storage_settings.jsx
@@ -21,16 +21,6 @@ export default class StorageSettings extends AdminSettings {
this.getConfigFromState = this.getConfigFromState.bind(this);
this.renderSettings = this.renderSettings.bind(this);
-
- this.state = Object.assign(this.state, {
- maxFileSize: props.config.FileSettings.MaxFileSize / 1024 / 1024,
- driverName: props.config.FileSettings.DriverName,
- directory: props.config.FileSettings.Directory,
- amazonS3AccessKeyId: props.config.FileSettings.AmazonS3AccessKeyId,
- amazonS3SecretAccessKey: props.config.FileSettings.AmazonS3SecretAccessKey,
- amazonS3Bucket: props.config.FileSettings.AmazonS3Bucket,
- amazonS3Region: props.config.FileSettings.AmazonS3Region
- });
}
getConfigFromState(config) {
@@ -45,6 +35,18 @@ export default class StorageSettings extends AdminSettings {
return config;
}
+ getStateFromConfig(config) {
+ return {
+ maxFileSize: config.FileSettings.MaxFileSize / 1024 / 1024,
+ driverName: config.FileSettings.DriverName,
+ directory: config.FileSettings.Directory,
+ amazonS3AccessKeyId: config.FileSettings.AmazonS3AccessKeyId,
+ amazonS3SecretAccessKey: config.FileSettings.AmazonS3SecretAccessKey,
+ amazonS3Bucket: config.FileSettings.AmazonS3Bucket,
+ amazonS3Region: config.FileSettings.AmazonS3Region
+ };
+ }
+
renderTitle() {
return (
<h3>