summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-06-13 14:36:40 -0400
committerGitHub <noreply@github.com>2016-06-13 14:36:40 -0400
commit974238231b9cdbd39a825ec8e9299fbb0b51f6b8 (patch)
tree5d6ede355ea80fc919f43d36a7c21fb96a603966 /webapp/components/admin_console
parentb353b9fbcfd924ca8ca01c416d1724ccd6113169 (diff)
downloadchat-974238231b9cdbd39a825ec8e9299fbb0b51f6b8.tar.gz
chat-974238231b9cdbd39a825ec8e9299fbb0b51f6b8.tar.bz2
chat-974238231b9cdbd39a825ec8e9299fbb0b51f6b8.zip
PLT-3270 Comment out max file size setting in system console (#3324)
* Comment out max file size settting in system console * Remove pending post after successful create post request
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/storage_settings.jsx41
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={[