diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/admin_console/storage_settings.jsx | 41 | ||||
-rw-r--r-- | webapp/components/create_post.jsx | 2 |
2 files changed, 22 insertions, 21 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={[ diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index 7aa0a586b..caf58c744 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -180,7 +180,7 @@ class CreatePost extends React.Component { Client.createPost(post, () => { - // DO nothing. Websockets will handle this. + PostStore.removePendingPost(post.pending_post_id); }, (err) => { if (err.id === 'api.post.create_post.root_id.app_error') { |