mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-24 23:48:13 -05:00
Added unsaved changes check to member details page
no issue - Adds unsaved changes check to member detail page for write operations
This commit is contained in:
parent
5a609a785f
commit
cb1c851f21
3 changed files with 87 additions and 3 deletions
|
@ -25,7 +25,7 @@ export default Controller.extend({
|
||||||
setProperty(propKey, value) {
|
setProperty(propKey, value) {
|
||||||
this._saveMemberProperty(propKey, value);
|
this._saveMemberProperty(propKey, value);
|
||||||
},
|
},
|
||||||
toggleDeleteTagModal() {
|
toggleDeleteMemberModal() {
|
||||||
this.toggleProperty('showDeleteMemberModal');
|
this.toggleProperty('showDeleteMemberModal');
|
||||||
},
|
},
|
||||||
finaliseDeletion() {
|
finaliseDeletion() {
|
||||||
|
@ -35,6 +35,44 @@ export default Controller.extend({
|
||||||
this.members.decrementProperty('meta.pagination.total');
|
this.members.decrementProperty('meta.pagination.total');
|
||||||
}
|
}
|
||||||
this.router.transitionTo('members');
|
this.router.transitionTo('members');
|
||||||
|
},
|
||||||
|
|
||||||
|
toggleUnsavedChangesModal(transition) {
|
||||||
|
let leaveTransition = this.leaveScreenTransition;
|
||||||
|
|
||||||
|
if (!transition && this.showUnsavedChangesModal) {
|
||||||
|
this.set('leaveScreenTransition', null);
|
||||||
|
this.set('showUnsavedChangesModal', false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!leaveTransition || transition.targetName === leaveTransition.targetName) {
|
||||||
|
this.set('leaveScreenTransition', transition);
|
||||||
|
|
||||||
|
// if a save is running, wait for it to finish then transition
|
||||||
|
if (this.save.isRunning) {
|
||||||
|
return this.save.last.then(() => {
|
||||||
|
transition.retry();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// we genuinely have unsaved data, show the modal
|
||||||
|
this.set('showUnsavedChangesModal', true);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
leaveScreen() {
|
||||||
|
let transition = this.leaveScreenTransition;
|
||||||
|
|
||||||
|
if (!transition) {
|
||||||
|
this.notifications.showAlert('Sorry, there was an error in the application. Please let the Ghost team know what happened.', {type: 'error'});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// roll back changes on model props
|
||||||
|
this.member.rollbackAttributes();
|
||||||
|
|
||||||
|
return transition.retry();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,24 @@
|
||||||
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
|
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
|
||||||
|
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
|
||||||
|
import {inject as service} from '@ember/service';
|
||||||
|
|
||||||
|
export default AuthenticatedRoute.extend(CurrentUserSettings, {
|
||||||
|
|
||||||
|
router: service(),
|
||||||
|
|
||||||
|
init() {
|
||||||
|
this._super(...arguments);
|
||||||
|
this.router.on('routeWillChange', (transition) => {
|
||||||
|
this.showUnsavedChangesModal(transition);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
beforeModel() {
|
||||||
|
this._super(...arguments);
|
||||||
|
return this.get('session.user')
|
||||||
|
.then(this.transitionAuthor());
|
||||||
|
},
|
||||||
|
|
||||||
export default AuthenticatedRoute.extend({
|
|
||||||
model(params) {
|
model(params) {
|
||||||
this._isMemberUpdated = true;
|
this._isMemberUpdated = true;
|
||||||
return this.store.findRecord('member', params.member_id, {
|
return this.store.findRecord('member', params.member_id, {
|
||||||
|
@ -19,10 +37,31 @@ export default AuthenticatedRoute.extend({
|
||||||
this._super(...arguments);
|
this._super(...arguments);
|
||||||
|
|
||||||
// clear the properties
|
// clear the properties
|
||||||
|
let {controller} = this;
|
||||||
|
controller.model.rollbackAttributes();
|
||||||
|
this.set('controller.model', null);
|
||||||
this._isMemberUpdated = false;
|
this._isMemberUpdated = false;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
actions: {
|
||||||
|
save() {
|
||||||
|
this.controller.send('save');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
titleToken() {
|
titleToken() {
|
||||||
return this.controller.get('member.name');
|
return this.controller.get('member.name');
|
||||||
|
},
|
||||||
|
|
||||||
|
showUnsavedChangesModal(transition) {
|
||||||
|
if (transition.from && transition.from.name.match(/^member$/) && transition.targetName) {
|
||||||
|
let {controller} = this;
|
||||||
|
|
||||||
|
if (!controller.member.isDeleted && controller.member.hasDirtyAttributes) {
|
||||||
|
transition.abort();
|
||||||
|
controller.send('toggleUnsavedChangesModal', transition);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
{{gh-member-settings-form member=member
|
{{gh-member-settings-form member=member
|
||||||
setProperty=(action "setProperty")
|
setProperty=(action "setProperty")
|
||||||
isLoading=this.isLoading
|
isLoading=this.isLoading
|
||||||
showDeleteTagModal=(action "toggleDeleteTagModal")}}
|
showDeleteTagModal=(action "toggleDeleteMemberModal")}}
|
||||||
</form>
|
</form>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
@ -43,6 +43,13 @@
|
||||||
</button>
|
</button>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
{{#if showUnsavedChangesModal}}
|
||||||
|
{{gh-fullscreen-modal "leave-settings"
|
||||||
|
confirm=(action "leaveScreen")
|
||||||
|
close=(action "toggleUnsavedChangesModal")
|
||||||
|
modifier="action wide"}}
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
{{#if showDeleteMemberModal}}
|
{{#if showDeleteMemberModal}}
|
||||||
{{gh-fullscreen-modal "delete-member"
|
{{gh-fullscreen-modal "delete-member"
|
||||||
model=(hash member=member onSuccess=(action "finaliseDeletion"))
|
model=(hash member=member onSuccess=(action "finaliseDeletion"))
|
||||||
|
|
Loading…
Add table
Reference in a new issue