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

ENH: Collection environment measurement (#65)

Browse source
This commit is contained in:
Matthew Ryan Dillon 2018-01-14 18:01:12 -07:00 • committed by GitHub
parent 56f8796eaf
commit 39f4789a61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 103 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import Ember from 'ember';
import CollectionValidations from 'ccdb-web/validations/collection';
import CollectionSpeciesValidations from 'ccdb-web/validations/collection-species';
import CollectionMeasurementValidations from 'ccdb-web/validations/collection-measurement';
import DatasheetValidations from 'ccdb-web/validations/datasheet';
import ValidationMixin from 'ccdb-web/mixins/validation';
@ -10,8 +11,9 @@ export default Controller.extend(ValidationMixin, {
CollectionValidations,
CollectionSpeciesValidations,
DatasheetValidations,
CollectionMeasurementValidations,
hasMany: ['collectionSpecies', 'datasheets'],
hasMany: ['collectionSpecies', 'datasheets', 'envMeasurements'],
options: computed('projectOptions', 'studyLocationOptions',
'collectionTypeOptions', 'collectionMethodOptions',

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

@ -1,6 +1,7 @@
import Ember from 'ember';
import CollectionValidations from 'ccdb-web/validations/collection';
import CollectionSpeciesValidations from 'ccdb-web/validations/collection-species';
import CollectionMeasurementValidations from 'ccdb-web/validations/collection-measurement';
import DatasheetValidations from 'ccdb-web/validations/datasheet';
import ValidationMixin from 'ccdb-web/mixins/validation';
@ -10,8 +11,9 @@ export default Controller.extend(ValidationMixin, {
CollectionValidations,
CollectionSpeciesValidations,
DatasheetValidations,
CollectionMeasurementValidations,
hasMany: ['collectionSpecies', 'datasheets'],
hasMany: ['collectionSpecies', 'datasheets', 'envMeasurements'],
options: computed('projectOptions', 'studyLocationOptions',
'collectionTypeOptions', 'collectionMethodOptions',