thermokarst/ccdb-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUG: Editing collections loading indicator (#63)

Browse source
This commit is contained in:
Matthew Ryan Dillon 2017-12-12 07:58:28 -07:00 • committed by GitHub
parent a4264ac16c
commit dcbad4d54b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/collections/create.js
View file

@ -29,11 +29,15 @@ export default Controller.extend(ValidationMixin, {
actions: { actions: {
onSave(changeset) { onSave(changeset) {
const postSave = () => { this.transitionToRoute('collections.index'); }; const postSave = () => { this.transitionToRoute('collections.index'); };
return this.validationSave(changeset, postSave); return this.transitionToRoute('loading').then(() => {
return this.validationSave(changeset, postSave);
});
}, },
onCancel(changeset) { onCancel(changeset) {
const postCancel = () => { this.transitionToRoute('collections.index'); }; const postCancel = () => { this.transitionToRoute('collections.index'); };
return this.validationCancel(changeset, postCancel); return this.transitionToRoute('loading').then(() => {
return this.validationCancel(changeset, postCancel);
});
}, },
}, },
}); });

8
app/controllers/collections/detail/edit.js
View file

@ -32,14 +32,18 @@ export default Controller.extend(ValidationMixin, {
// Use the model's ID here because of the ArrayProxy in the route // Use the model's ID here because of the ArrayProxy in the route
this.transitionToRoute('collections.detail', this.get('model.id')); this.transitionToRoute('collections.detail', this.get('model.id'));
}; };
return this.validationSave(changesets, postSave); return this.transitionToRoute('loading').then(() => {
return this.validationSave(changesets, postSave);
});
}, },
onCancel(changesets) { onCancel(changesets) {
const postCancel = () => { const postCancel = () => {
// Use the model's ID here because of the ArrayProxy in the route // Use the model's ID here because of the ArrayProxy in the route
return this.transitionToRoute('collections.detail', this.get('model.id')); return this.transitionToRoute('collections.detail', this.get('model.id'));
}; };
return this.validationCancel(changesets, postCancel); return this.transitionToRoute('loading').then(() => {
return this.validationCancel(changesets, postCancel);
});
}, },
}, },
}); });