diff --git a/app/models/characteristic.js b/app/models/characteristic.js index 8851175..766fdbf 100644 --- a/app/models/characteristic.js +++ b/app/models/characteristic.js @@ -7,10 +7,8 @@ export default DS.Model.extend({ measurements : DS.hasMany('measurements', { async: false }), createdAt : DS.attr('date'), updatedAt : DS.attr('date'), - deletedAt : DS.attr('date'), createdBy : DS.attr('number'), updatedBy : DS.attr('number'), - deletedBy : DS.attr('number'), sortOrder : DS.attr('number'), canEdit : DS.attr('boolean'), }); diff --git a/app/models/species.js b/app/models/species.js index c8746bd..bb27451 100644 --- a/app/models/species.js +++ b/app/models/species.js @@ -11,10 +11,8 @@ export default DS.Model.extend({ totalStrains: DS.attr('number'), createdAt : DS.attr('date'), updatedAt : DS.attr('date'), - deletedAt : DS.attr('date'), createdBy : DS.attr('number'), updatedBy : DS.attr('number'), - deletedBy : DS.attr('number'), sortOrder : DS.attr('number'), canEdit : DS.attr('boolean'), diff --git a/app/models/strain.js b/app/models/strain.js index 7bd4e50..72d4ff6 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -14,10 +14,8 @@ export default DS.Model.extend({ notes : DS.attr('string'), createdAt : DS.attr('date'), updatedAt : DS.attr('date'), - deletedAt : DS.attr('date'), createdBy : DS.attr('number'), updatedBy : DS.attr('number'), - deletedBy : DS.attr('number'), totalMeasurements : DS.attr('number'), sortOrder : DS.attr('number'), canEdit : DS.attr('boolean'), diff --git a/app/models/user.js b/app/models/user.js index 680a9f4..57a74fd 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -8,7 +8,6 @@ export default DS.Model.extend({ canEdit : DS.attr('boolean'), createdAt: DS.attr('date'), updatedAt: DS.attr('date'), - deletedAt: DS.attr('date'), isAdmin: function() { return this.get('role') === 'A'; diff --git a/app/pods/protected/characteristics/show/template.hbs b/app/pods/protected/characteristics/show/template.hbs index 010a8c5..c0206ee 100644 --- a/app/pods/protected/characteristics/show/template.hbs +++ b/app/pods/protected/characteristics/show/template.hbs @@ -33,7 +33,7 @@ {{! ROW 3 }} -