diff options
| author | JoramWilander <jwawilander@gmail.com> | 2016-06-13 15:29:24 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2016-06-13 15:29:24 -0400 |
| commit | 5af526c259d9c6477d67eb8f8a1e7b86270c7294 (patch) | |
| tree | 97cc595107026a1f19d6fd6e35627dda23979aa3 /webapp/components/admin_console/storage_settings.jsx | |
| parent | bb5ca5a8780f9259306d881e85760de8b87ddea8 (diff) | |
| parent | 974238231b9cdbd39a825ec8e9299fbb0b51f6b8 (diff) | |
| download | chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.tar.gz chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.tar.bz2 chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.zip | |
Merge branch 'release-3.1'
Conflicts:
webapp/components/create_comment.jsx
Diffstat (limited to 'webapp/components/admin_console/storage_settings.jsx')
| -rw-r--r-- | webapp/components/admin_console/storage_settings.jsx | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx index 60eedc2d2..077d75c73 100644 --- a/webapp/components/admin_console/storage_settings.jsx +++ b/webapp/components/admin_console/storage_settings.jsx @@ -22,8 +22,8 @@ export default class StorageSettings extends AdminSettings { this.renderSettings = this.renderSettings.bind(this); + //maxFileSize: props.config.FileSettings.MaxFileSize, this.state = Object.assign(this.state, { - maxFileSize: props.config.FileSettings.MaxFileSize, driverName: props.config.FileSettings.DriverName, directory: props.config.FileSettings.Directory, amazonS3AccessKeyId: props.config.FileSettings.AmazonS3AccessKeyId, @@ -34,7 +34,7 @@ export default class StorageSettings extends AdminSettings { } getConfigFromState(config) { - config.FileSettings.MaxFileSize = this.parseInt(this.state.maxFileSize); + //config.FileSettings.MaxFileSize = this.parseInt(this.state.maxFileSize); config.FileSettings.DriverName = this.state.driverName; config.FileSettings.Directory = this.state.directory; config.FileSettings.AmazonS3AccessKeyId = this.state.amazonS3AccessKeyId; @@ -57,26 +57,27 @@ export default class StorageSettings extends AdminSettings { } renderSettings() { + /*<TextSetting + id='maxFileSize' + label={ + <FormattedMessage + id='admin.image.maxFileSizeTitle' + defaultMessage='Max File Size:' + /> + } + placeholder={Utils.localizeMessage('admin.image.maxFileSizeExample', 'Ex "52428800"')} + helpText={ + <FormattedMessage + id='admin.image.maxFileSizeDescription' + defaultMessage='Max File Size in bytes. If blank, will be set to 52428800 (50MB).' + /> + } + value={this.state.maxFileSize} + onChange={this.handleChange} + />*/ + return ( <SettingsGroup> - <TextSetting - id='maxFileSize' - label={ - <FormattedMessage - id='admin.image.maxFileSizeTitle' - defaultMessage='Max File Size:' - /> - } - placeholder={Utils.localizeMessage('admin.image.maxFileSizeExample', 'Ex "52428800"')} - helpText={ - <FormattedMessage - id='admin.image.maxFileSizeDescription' - defaultMessage='Max File Size in bytes. If blank, will be set to 52428800 (50MB).' - /> - } - value={this.state.maxFileSize} - onChange={this.handleChange} - /> <DropdownSetting id='driverName' values={[ |