summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/file_upload_setting.jsx
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-07-12 16:10:04 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-07-12 16:10:04 -0400
commitab52700aaa76a5623de23cd0156f5dbd9a24e264 (patch)
treec00981cd4644b317207d4f646387c45338c21a1e /webapp/components/admin_console/file_upload_setting.jsx
parentcaef414abea77bf0576aef927c9eaf0f205f9b6f (diff)
downloadchat-ab52700aaa76a5623de23cd0156f5dbd9a24e264.tar.gz
chat-ab52700aaa76a5623de23cd0156f5dbd9a24e264.tar.bz2
chat-ab52700aaa76a5623de23cd0156f5dbd9a24e264.zip
PLT-3624 quick fix remove SAML certificates without saving (#3555)
Diffstat (limited to 'webapp/components/admin_console/file_upload_setting.jsx')
-rw-r--r--webapp/components/admin_console/file_upload_setting.jsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/webapp/components/admin_console/file_upload_setting.jsx b/webapp/components/admin_console/file_upload_setting.jsx
index e7cb387ee..a7df16c0a 100644
--- a/webapp/components/admin_console/file_upload_setting.jsx
+++ b/webapp/components/admin_console/file_upload_setting.jsx
@@ -18,7 +18,8 @@ export default class FileUploadSetting extends Setting {
uploadingText: React.PropTypes.node,
onSubmit: React.PropTypes.func.isRequired,
disabled: React.PropTypes.bool,
- fileType: React.PropTypes.string.isRequired
+ fileType: React.PropTypes.string.isRequired,
+ error: React.PropTypes.string
};
}
@@ -29,7 +30,8 @@ export default class FileUploadSetting extends Setting {
this.handleSubmit = this.handleSubmit.bind(this);
this.state = {
- fileName: null
+ fileName: null,
+ serverError: props.error
};
}