summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-07-28 13:52:31 -0400
committerCorey Hulen <corey@hulen.com>2017-07-28 11:52:31 -0600
commit3c0f082506a68240abd1960cbd0fda22679e12c2 (patch)
tree395a1e9ecdb1eb2c6d7bf7141e3364cc043d9edd /webapp
parentda6e6ca0bf3f880b60de8d809a7588dfbec3a77a (diff)
downloadchat-3c0f082506a68240abd1960cbd0fda22679e12c2.tar.gz
chat-3c0f082506a68240abd1960cbd0fda22679e12c2.tar.bz2
chat-3c0f082506a68240abd1960cbd0fda22679e12c2.zip
PLT-6924 Added config options to disable file uploads/downloads on mobile (#7049)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/storage_settings.jsx44
-rwxr-xr-xwebapp/i18n/en.json8
2 files changed, 48 insertions, 4 deletions
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx
index 1400b673c..934a82f8f 100644
--- a/webapp/components/admin_console/storage_settings.jsx
+++ b/webapp/components/admin_console/storage_settings.jsx
@@ -26,6 +26,8 @@ export default class StorageSettings extends AdminSettings {
getConfigFromState(config) {
config.FileSettings.EnableFileAttachments = this.state.enableFileAttachments;
+ config.FileSettings.EnableMobileUpload = this.state.enableMobileUpload;
+ config.FileSettings.EnableMobileDownload = this.state.enableMobileDownload;
config.FileSettings.MaxFileSize = this.parseInt(this.state.maxFileSize) * 1024 * 1024;
config.FileSettings.DriverName = this.state.driverName;
config.FileSettings.Directory = this.state.directory;
@@ -41,6 +43,8 @@ export default class StorageSettings extends AdminSettings {
getStateFromConfig(config) {
return {
enableFileAttachments: config.FileSettings.EnableFileAttachments,
+ enableMobileUpload: config.FileSettings.EnableMobileUpload,
+ enableMobileDownload: config.FileSettings.EnableMobileDownload,
maxFileSize: config.FileSettings.MaxFileSize / 1024 / 1024,
driverName: config.FileSettings.DriverName,
directory: config.FileSettings.Directory,
@@ -206,18 +210,54 @@ export default class StorageSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.file.enableFileAttachments'
- defaultMessage='Enable File Attachments:'
+ defaultMessage='Allow File Sharing:'
/>
}
helpText={
<FormattedMessage
id='admin.file.enableFileAttachmentsDesc'
- defaultMessage='When false, disable file and image uploads on messages.'
+ defaultMessage='When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.'
/>
}
value={this.state.enableFileAttachments}
onChange={this.handleChange}
/>
+ <BooleanSetting
+ id='enableMobileUpload'
+ label={
+ <FormattedMessage
+ id='admin.file.enableMobileUploadTitle'
+ defaultMessage='Allow File Uploads on Mobile:'
+ />
+ }
+ helpText={
+ <FormattedMessage
+ id='admin.file.enableMobileUploadDesc'
+ defaultMessage='When false, disables file uploads on mobile apps. If Allow File Sharing is set to true, users can still upload files from a mobile web browser.'
+ />
+ }
+ value={this.state.enableMobileUpload}
+ onChange={this.handleChange}
+ disabled={!this.state.enableFileAttachments}
+ />
+ <BooleanSetting
+ id='enableMobileDownload'
+ label={
+ <FormattedMessage
+ id='admin.file.enableMobileDownloadTitle'
+ defaultMessage='Allow File Downloads on Mobile:'
+ />
+ }
+ helpText={
+ <FormattedMessage
+ id='admin.file.enableMobileDownloadDesc'
+ defaultMessage='When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.'
+ />
+ }
+ value={this.state.enableMobileDownload}
+ onChange={this.handleChange}
+ disabled={!this.state.enableFileAttachments}
+ />
<TextSetting
id='maxFileSize'
label={
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 1ba02cfff..202aad177 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -323,8 +323,12 @@
"admin.email.smtpUsernameTitle": "SMTP Server Username:",
"admin.email.testing": "Testing...",
"admin.false": "false",
- "admin.file.enableFileAttachments": "Enable File Attachments:",
- "admin.file.enableFileAttachmentsDesc": "When false, disable file and image uploads on messages.",
+ "admin.file.enableFileAttachments": "Allow File Sharing:",
+ "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
+ "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
+ "admin.file.enableMobileDownloadTitle": "Allow File Downloads on Mobile:",
+ "admin.file.enableMobileUploadDesc": "When false, disables file uploads on mobile apps. If Allow File Sharing is set to true, users can still upload files from a mobile web browser.",
+ "admin.file.enableMobileUploadTitle": "Allow File Uploads on Mobile:",
"admin.file_upload.chooseFile": "Choose File",
"admin.file_upload.noFile": "No file uploaded",
"admin.file_upload.uploadFile": "Upload",