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

WIP

Browse source
This commit is contained in:
Matthew Ryan Dillon 2017-12-03 20:18:46 -07:00
parent 7f73046773
commit 4875f42152
3 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ export default Controller.extend(ValidationMixin, {
DatasheetValidations, DatasheetValidations,
hasMany: ['collectionSpecies', 'datasheets'], hasMany: ['collectionSpecies', 'datasheets'],
safeNavigate: false,
options: computed('projectOptions', 'studyLocationOptions', options: computed('projectOptions', 'studyLocationOptions',
'collectionTypeOptions', 'collectionMethodOptions', 'collectionTypeOptions', 'collectionMethodOptions',
@ -29,15 +30,21 @@ export default Controller.extend(ValidationMixin, {
actions: { actions: {
onSave(changesets) { onSave(changesets) {
const postSave = () => { const postSave = () => {
this.set('safeNavigate', true);
// 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'));
this.set('safeNavigate', false);
console.log('save');
}; };
return this.validationSave(changesets, postSave); return this.validationSave(changesets, postSave);
}, },
onCancel(changesets) { onCancel(changesets) {
const postCancel = () => { const postCancel = () => {
this.set('safeNavigate', true);
// 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')); this.transitionToRoute('collections.detail', this.get('model.id'));
this.set('safeNavigate', false);
console.log('cancel');
}; };
return this.validationCancel(changesets, postCancel); return this.validationCancel(changesets, postCancel);
}, },

38
app/mixins/cleanup-form.js
View file

@ -5,28 +5,32 @@ const { Mixin, run: { once } } = Ember;
export default Mixin.create({ export default Mixin.create({
actions: { actions: {
willTransition(transition) { willTransition(transition) {
if (confirm('Any unsaved changes will be discarded.')) { if (!this.get('controller.safeNavigate')) {
let model = this.get('controller.model'); if (confirm('Any unsaved changes will be discarded.')) {
let hasMany = this.get('controller.hasMany'); let model = this.get('controller.model');
let hasMany = this.get('controller.hasMany');
hasMany.forEach((relationship) => { hasMany.forEach((relationship) => {
model.get(relationship).forEach((r) => { model.get(relationship).forEach((r) => {
once(this, () => { once(this, () => {
if (r.get('isNew')) { if (r.get('isNew')) {
r.deleteRecord(); r.deleteRecord();
} else { } else {
r.rollbackAttributes(); r.rollbackAttributes();
} }
}, this); }, this);
});
}); });
});
if (model.get('isNew')) { if (model.get('isNew')) {
model.deleteRecord(); model.deleteRecord();
}
} else {
transition.abort();
return false
} }
} else {
return false;
} }
return true;
}, },
}, },
}); });

1
config/environment.js
View file

@ -26,6 +26,7 @@ module.exports = function(environment) {
if (environment === 'development') { if (environment === 'development') {
ENV.APP.API_HOST = 'http://localhost:8000'; ENV.APP.API_HOST = 'http://localhost:8000';
ENV.APP.API_NAMESPACE = 'api/v1'; ENV.APP.API_NAMESPACE = 'api/v1';
ENV.APP.LOG_TRANSITIONS = true;
} }
if (environment === 'test') { if (environment === 'test') {