github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 17:57:04 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity

Set this.changingState back to false in ExtensionPage if an error occurs (#2558)

Browse Source
This commit is contained in:
David Sevilla Martín 2021-01-30 17:43:28 -05:00 committed by GitHub
parent 54d78f4630
commit eedb6d3752
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
framework/core/js/src/admin/components/ExtensionPage.js
View File

@ -59,6 +59,8 @@ export default class ExtensionPage extends Page {
}
header() {
const isEnabled = this.isEnabled();
return [
<div className="ExtensionPage-header">
<div className="container">
@ -75,10 +77,12 @@ export default class ExtensionPage extends Page {
</div>
<div className="helpText">{this.extension.description}</div>
<div className="ExtensionPage-headerItems">
<Switch state={this.isEnabled()} onchange={this.toggle.bind(this, this.extension.id)}>
{this.isEnabled(this.extension.id)
? app.translator.trans('core.admin.extension.enabled')
: app.translator.trans('core.admin.extension.disabled')}
<Switch
state={this.changingState ? !isEnabled : isEnabled}
loading={this.changingState}
onchange={this.toggle.bind(this, this.extension.id)}
>
{isEnabled ? app.translator.trans('core.admin.extension.enabled') : app.translator.trans('core.admin.extension.disabled')}
</Switch>
<aside className="ExtensionInfo">
<ul>{listItems(this.infoItems().toArray())}</ul>
@ -333,9 +337,7 @@ export default class ExtensionPage extends Page {
}
isEnabled() {
let isEnabled = isExtensionEnabled(this.extension.id);
return this.changingState ? !isEnabled : isEnabled;
return isExtensionEnabled(this.extension.id);
}
onerror(e) {
@ -346,6 +348,8 @@ export default class ExtensionPage extends Page {
app.modal.close();
}, 300); // Bootstrap's Modal.TRANSITION_DURATION is 300 ms.
this.changingState = false;
if (e.status !== 409) {
throw e;
}