TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 22:43:30 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fixed unexpected "unsaved changes" modals when accessing screens

Browse Source 
no issue

We weren't correctly clearing state for the "display modal" booleans when leaving screens. This meant that it was possible to end up in a state where where every time you access a screen you get the unsaved changes modal
This commit is contained in:
Kevin Ansfield 2019-12-13 17:09:06 +00:00
parent 4c9fc47df8
commit a6c005e5be
5 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghost/admin/app/controllers/editor.js
View File

@ -668,6 +668,7 @@ export default Controller.extend({
this.set('hasDirtyAttributes', false);
this.set('shouldFocusEditor', false);
this.set('leaveEditorTransition', null);
this.set('showLeaveEditorModal', false);
this.set('infoMessage', null);
this.set('wordCount', null);

6
ghost/admin/app/routes/settings/code-injection.js
View File

@ -16,6 +16,12 @@ export default AuthenticatedRoute.extend(CurrentUserSettings, {
return this.settings.reload();
},
deactivate() {
this._super(...arguments);
this.controller.set('leaveSettingsTransition', null);
this.controller.set('showLeaveSettingsModal', false);
},
actions: {
save() {
this.controller.send('save');

8
ghost/admin/app/routes/settings/design.js
View File

@ -21,12 +21,16 @@ export default AuthenticatedRoute.extend(CurrentUserSettings, {
},
setupController(controller) {
// reset the leave setting transition
controller.set('leaveSettingsTransition', null);
controller.set('themes', this.store.peekAll('theme'));
this.controller.send('reset');
},
deactivate() {
this._super(...arguments);
this.controller.set('leaveSettingsTransition', null);
this.controller.set('showLeaveSettingsModal', false);
},
actions: {
save() {
// since shortcuts are run on the route, we have to signal to the components

1
ghost/admin/app/routes/settings/general.js
View File

@ -23,6 +23,7 @@ export default AuthenticatedRoute.extend(CurrentUserSettings, {
setupController(controller, models) {
// reset the leave setting transition
controller.set('showLeaveSettingsModal', false);
controller.set('leaveSettingsTransition', null);
controller.set('availableTimezones', models.availableTimezones);
},

6
ghost/admin/app/routes/settings/integration.js
View File

@ -28,6 +28,12 @@ export default AuthenticatedRoute.extend(CurrentUserSettings, {
.integrationModelHook('id', params.integration_id, this, transition);
},
deactivate() {
this._super(...arguments);
this.controller.set('leaveScreenTransition', null);
this.controller.set('showUnsavedChangesModal', false);
},
actions: {
save() {
this.controller.send('save');