diff options
| author | JoramWilander <jwawilander@gmail.com> | 2016-01-13 12:56:35 -0500 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2016-01-14 08:24:09 -0500 |
| commit | 22c522178ce5a4b9e9533d91dd77518a2899f2b0 (patch) | |
| tree | fd1d40456098d83675d1aefb3a0ea2371f089fb0 | |
| parent | 537a220d070371b1a6f30a6144570a1e63a3a88e (diff) | |
| download | chat-22c522178ce5a4b9e9533d91dd77518a2899f2b0.tar.gz chat-22c522178ce5a4b9e9533d91dd77518a2899f2b0.tar.bz2 chat-22c522178ce5a4b9e9533d91dd77518a2899f2b0.zip | |
Fix error message
| -rw-r--r-- | web/react/components/admin_console/license_settings.jsx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/web/react/components/admin_console/license_settings.jsx b/web/react/components/admin_console/license_settings.jsx index d49056601..ba953f3bd 100644 --- a/web/react/components/admin_console/license_settings.jsx +++ b/web/react/components/admin_console/license_settings.jsx @@ -43,10 +43,13 @@ export default class LicenseSettings extends React.Component { () => { Utils.clearFileInput(element[0]); $('#upload-button').button('reset'); + this.setState({serverError: null}); window.location.reload(true); }, - (serverError) => { - this.setState({serverError}); + (error) => { + Utils.clearFileInput(element[0]); + $('#upload-button').button('reset'); + this.setState({serverError: error.message}); } ); } @@ -59,11 +62,12 @@ export default class LicenseSettings extends React.Component { Client.removeLicenseFile( () => { $('#remove-button').button('reset'); + this.setState({serverError: null}); window.location.reload(true); }, - (serverError) => { + (error) => { $('#remove-button').button('reset'); - this.setState({serverError}); + this.setState({serverError: error.message}); } ); } @@ -164,7 +168,6 @@ export default class LicenseSettings extends React.Component { accept='.mattermost-license' onChange={this.handleChange} /> - {serverError} <button className={btnClass + ' pull-left'} disabled={!this.state.fileSelected} @@ -176,6 +179,8 @@ export default class LicenseSettings extends React.Component { </button> <br/> <br/> + <br/> + {serverError} <p className='help-text'> {'Upload a license key for Mattermost Enterprise Edition to upgrade this server. '} <a |