diff --git a/app/pods/application/adapter.js b/app/pods/application/adapter.js index e979dec..bb89c25 100644 --- a/app/pods/application/adapter.js +++ b/app/pods/application/adapter.js @@ -5,10 +5,13 @@ export default DS.RESTAdapter.extend({ namespace: function() { return 'api/' + this.get('globals.genus'); }.property(), + host: function() { return this.get('globals.apiURL'); }.property(), + coalesceFindRequests: true, + ajaxError: function(jqXHR) { // http://stackoverflow.com/a/24027443 var error = this._super(jqXHR); @@ -25,5 +28,5 @@ export default DS.RESTAdapter.extend({ } else { return error; } - } + }, }); diff --git a/app/pods/components/forms/species-form/component.js b/app/pods/components/forms/species-form/component.js new file mode 100644 index 0000000..0e5912c --- /dev/null +++ b/app/pods/components/forms/species-form/component.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + actions: { + save: function() { + this.sendAction('save'); + }, + cancel: function() { + this.sendAction('cancel'); + }, + } +}); diff --git a/app/pods/components/forms/species-form/template.hbs b/app/pods/components/forms/species-form/template.hbs new file mode 100644 index 0000000..fda54bc --- /dev/null +++ b/app/pods/components/forms/species-form/template.hbs @@ -0,0 +1,42 @@ +
+
+ {{species.speciesName}} +
+
+ + {{input value=species.speciesName}} +
+
+ + {{input type="checkbox" checked=species.typeSpecies}} {{if species.typeSpecies 'Yes' 'No'}} +
+
+
+
+ + {{#each species.strains as |strain index|}} + {{if index ","}} + {{#link-to 'strains.show' strain.id}} + {{{strain.strainNameMU}}} + {{/link-to}} + {{/each}} + {{add-button label="Add Strain" link="strains.new"}} +
+
+
+
+ + {{textarea value=species.etymology cols="70" rows="5"}} +
+
+
+
+
+{{#if species.isDirty}} + + Save + +{{/if}} + + Cancel + diff --git a/app/pods/components/species-details/component.js b/app/pods/components/species-details/component.js deleted file mode 100644 index 6070141..0000000 --- a/app/pods/components/species-details/component.js +++ /dev/null @@ -1,20 +0,0 @@ -import Ember from 'ember'; -import userCanEdit from '../../../utils/user-can-edit'; - -export default Ember.Component.extend({ - classNames: ['grid-1'], - isEditing: false, - - canEdit: function() { - return userCanEdit(this.get('session.currentUser'), this.get('species.createdBy')); - }.property('session.currentUser', 'species.createdBy').readOnly(), - - actions: { - save: function() { - this.sendAction('save'); - }, - cancel: function() { - this.sendAction('cancel'); - }, - } -}); diff --git a/app/pods/components/species-details/template.hbs b/app/pods/components/species-details/template.hbs deleted file mode 100644 index 813ada2..0000000 --- a/app/pods/components/species-details/template.hbs +++ /dev/null @@ -1,89 +0,0 @@ -
-
- - Species - {{#if isEditing}} - {{input value=species.speciesName}} - {{else}} - {{species.speciesName}} - {{/if}} - {{display-errors a=species.errors.speciesName}} - - - {{! ROW 1 }} -
-
-
Strains
-
- {{#each species.strains as |strain index|}} - {{if index ","}} - {{#link-to 'strains.show' strain.id}} - {{{strain.strainNameMU}}} - {{/link-to}} - {{/each}} - {{#unless species.isNew}} - {{add-button label="Add Strain" link="strains.new"}} - {{/unless}} -
-
-
-
Type Species?
-
- {{#if isEditing}} - {{input type="checkbox" checked=species.typeSpecies}} - {{/if}} - {{if species.typeSpecies 'Yes' 'No'}} - {{display-errors a=species.errors.typeSpecies}} -
-
-
- - {{! ROW 2 }} -
-
-
Etymology
-
- {{#if isEditing}} - {{textarea value=species.etymology cols="70" rows="3"}} - {{else}} - {{species.etymology}} - {{/if}} - {{display-errors a=species.errors.etymology}} -
-
-
- - {{! ROW 3 }} -
-
-
Record Created
-
{{null-time species.createdAt 'LL'}}
-
-
-
Record Updated
-
{{null-time species.updatedAt 'LL'}}
-
-
-
Record Deleted
-
{{null-time species.deletedAt 'LL'}}
-
-
-
- - {{! ROW 4 }} - {{#if canEdit}} -
-
- - {{#if isEditing}}Cancel{{else}}Edit{{/if}} - - {{#if isEditing}} - - Save - - {{/if}} -
-
- {{/if}} -
-
diff --git a/app/pods/species/edit/controller.js b/app/pods/species/edit/controller.js new file mode 100644 index 0000000..463392e --- /dev/null +++ b/app/pods/species/edit/controller.js @@ -0,0 +1,29 @@ +import Ember from 'ember'; + +export default Ember.Controller.extend({ + actions: { + save: function() { + let species = this.get('model'); + + if (species.get('isDirty')) { + species.save().then((species) => { + this.transitionToRoute('species.show', species.get('id')); + }, (err) => { + this.get('flashMessages').error(err.responseJSON.error); + }); + } else { + this.transitionToRoute('species.show', species.get('id')); + } + }, + + cancel: function() { + let species = this.get('model'); + + species.get('errors').clear(); + species.rollback(); + + this.transitionToRoute('species.show', species.get('id')); + }, + + }, +}); diff --git a/app/pods/species/edit/route.js b/app/pods/species/edit/route.js new file mode 100644 index 0000000..b3f843f --- /dev/null +++ b/app/pods/species/edit/route.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; +import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; + +export default Ember.Route.extend(AuthenticatedRouteMixin, {}); diff --git a/app/pods/species/edit/template.hbs b/app/pods/species/edit/template.hbs new file mode 100644 index 0000000..5c6c82f --- /dev/null +++ b/app/pods/species/edit/template.hbs @@ -0,0 +1,6 @@ +{{ + forms/species-form + species=model + save="save" + cancel="cancel" +}} diff --git a/app/pods/species/index/route.js b/app/pods/species/index/route.js index d2ab490..b0968ba 100644 --- a/app/pods/species/index/route.js +++ b/app/pods/species/index/route.js @@ -5,10 +5,11 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return Ember.RSVP.hash({ species: this.store.findAll('species'), + strains: this.store.findAll('strain'), }); }, - setupController: function(controller, model) { - controller.setProperties(model); + setupController: function(controller, models) { + controller.setProperties(models); }, }); diff --git a/app/pods/species/index/template.hbs b/app/pods/species/index/template.hbs index 00454fb..b02064a 100644 --- a/app/pods/species/index/template.hbs +++ b/app/pods/species/index/template.hbs @@ -1,5 +1,5 @@

{{genus-name}} Species

-

Total species: {{species.length}}

+

Total species: {{model.length}}

{{add-button label="Add Species" link="species.new"}} @@ -11,17 +11,17 @@ - {{#each sortedSpecies as |row|}} + {{#each sortedSpecies as |species|}} - {{#link-to 'species.show' row}} - {{row.speciesName}} + {{#link-to 'species.show' species}} + {{species.speciesName}} {{/link-to}} - {{#each row.strains as |strain index|}} + {{#each species.strains as |strain index|}} {{if index ","}} {{#link-to 'strains.show' strain.id}} {{{strain.strainNameMU}}} diff --git a/app/pods/species/new/controller.js b/app/pods/species/new/controller.js index a289976..568648f 100644 --- a/app/pods/species/new/controller.js +++ b/app/pods/species/new/controller.js @@ -1,21 +1,30 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - isEditing: true, actions: { save: function() { - var species = this.get('model'); + let species = this.get('model'); + if (species.get('isDirty')) { - species.save(); + species.save().then((species) => { + this.transitionToRoute('species.show', species.get('id')); + }, (err) => { + this.get('flashMessages').error(err.responseJSON.error); + }); + } else { + this.transitionToRoute('species.index'); } - this.transitionToRoute('species.index'); }, + cancel: function() { - var species = this.get('model'); + let species = this.get('model'); + if (species.get('isNew')) { species.deleteRecord(); } + this.transitionToRoute('species.index'); - } - } + }, + + }, }); diff --git a/app/pods/species/new/route.js b/app/pods/species/new/route.js index b9f79eb..98741c6 100644 --- a/app/pods/species/new/route.js +++ b/app/pods/species/new/route.js @@ -5,9 +5,5 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return this.store.createRecord('species'); }, - actions: { - cancelSpecies: function() { - this.transitionTo('species.index'); - } - } + }); diff --git a/app/pods/species/new/template.hbs b/app/pods/species/new/template.hbs index f38417f..5c6c82f 100644 --- a/app/pods/species/new/template.hbs +++ b/app/pods/species/new/template.hbs @@ -1,7 +1,6 @@ {{ - species-details + forms/species-form species=model - isEditing=true save="save" cancel="cancel" }} diff --git a/app/pods/species/show/controller.js b/app/pods/species/show/controller.js deleted file mode 100644 index 2d5a523..0000000 --- a/app/pods/species/show/controller.js +++ /dev/null @@ -1,22 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Controller.extend({ - isEditing: false, - actions: { - save: function() { - var species = this.get('model'); - if (species.get('isDirty')) { - species.save(); - } - this.toggleProperty('isEditing'); - }, - cancel: function() { - if (this.get('isEditing')) { - var species = this.get('model'); - species.get('errors').clear(); - species.rollback(); - } - this.toggleProperty('isEditing'); - } - } -}); diff --git a/app/pods/species/show/template.hbs b/app/pods/species/show/template.hbs index b242fc5..11b72ba 100644 --- a/app/pods/species/show/template.hbs +++ b/app/pods/species/show/template.hbs @@ -1,7 +1,57 @@ -{{ - species-details - species=model - isEditing=isEditing - save="save" - cancel="cancel" -}} +
+
+
+ + Species {{model.speciesName}} + + + {{! ROW 1 }} +
+
+
Strains
+
+ {{#each model.strains as |strain index|}} + {{if index ","}} + {{#link-to 'strains.show' strain.id}} + {{{strain.strainNameMU}}} + {{/link-to}} + {{/each}} +
+
+
+
Type Species?
+
+ {{if model.typeSpecies 'Yes' 'No'}} +
+
+
+ + {{! ROW 2 }} +
+
+
Etymology
+
+ {{model.etymology}} +
+
+
+ + {{! ROW 3 }} +
+
+
Record Created
+
{{null-time model.createdAt 'LL'}}
+
+
+
Record Updated
+
{{null-time model.updatedAt 'LL'}}
+
+
+
Record Deleted
+
{{null-time model.deletedAt 'LL'}}
+
+
+
+
+
+
diff --git a/app/router.js b/app/router.js index 27112b6..6f43b21 100644 --- a/app/router.js +++ b/app/router.js @@ -15,6 +15,7 @@ Router.map(function() { this.route('species', function() { this.route('new'); this.route('show', { path: ':species_id' }); + this.route('edit', { path: ':species_id/edit' }); }); this.route('strains', function() { this.route('new');