Этот коммит содержится в:
JoramWilander
2016-01-13 12:56:35 -05:00
родитель 537a220d07
Коммит 22c522178c

Просмотреть файл

@@ -43,10 +43,13 @@ export default class LicenseSettings extends React.Component {
() => { () => {
Utils.clearFileInput(element[0]); Utils.clearFileInput(element[0]);
$('#upload-button').button('reset'); $('#upload-button').button('reset');
this.setState({serverError: null});
window.location.reload(true); window.location.reload(true);
}, },
(serverError) => { (error) => {
this.setState({serverError}); 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( Client.removeLicenseFile(
() => { () => {
$('#remove-button').button('reset'); $('#remove-button').button('reset');
this.setState({serverError: null});
window.location.reload(true); window.location.reload(true);
}, },
(serverError) => { (error) => {
$('#remove-button').button('reset'); $('#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' accept='.mattermost-license'
onChange={this.handleChange} onChange={this.handleChange}
/> />
{serverError}
<button <button
className={btnClass + ' pull-left'} className={btnClass + ' pull-left'}
disabled={!this.state.fileSelected} disabled={!this.state.fileSelected}
@@ -176,6 +179,8 @@ export default class LicenseSettings extends React.Component {
</button> </button>
<br/> <br/>
<br/> <br/>
<br/>
{serverError}
<p className='help-text'> <p className='help-text'>
{'Upload a license key for Mattermost Enterprise Edition to upgrade this server. '} {'Upload a license key for Mattermost Enterprise Edition to upgrade this server. '}
<a <a