thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Authorship

Browse source
This commit is contained in:
Matthew Dillon 2015-05-13 15:29:17 -08:00
parent e2aa298a8f
commit 8afce44a5e
7 changed files with 65 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/abilities/strain.js
View file

@ -11,7 +11,7 @@ export default Ability.extend({
canEdit: function() {
let role = this.get('session.currentUser.role');
let id = this.get('session.currentUser.id');
let author = this.get('model.author');
let author = this.get('model.createdBy');
return (role === 'W' && (+id === author)) || (role === 'A');
}.property('session.currentUser.role', 'session.currentUser.id', 'model.author')
}.property('session.currentUser.role', 'session.currentUser.id', 'model.createdBy')
});

5
app/models/characteristic.js
View file

@ -7,5 +7,8 @@ export default DS.Model.extend({
measurements: DS.hasMany('measurements'),
createdAt: DS.attr('date'),
updatedAt: DS.attr('date'),
deletedAt: DS.attr('date')
deletedAt: DS.attr('date'),
createdBy: DS.attr('number'),
updatedBy: DS.attr('number'),
deletedBy: DS.attr('number')
});

2
app/models/measurement.js
View file

@ -13,6 +13,8 @@ export default DS.Model.extend({
testMethod: DS.attr('string'),
createdAt: DS.attr('date'),
updatedAt: DS.attr('date'),
createdBy: DS.attr('number'),
updatedBy: DS.attr('number'),
computedType: Ember.computed('textMeasurementType', 'txtValue', 'numValue', function() {
if (this.get('textMeasurementType') && !this.get('txtValue') && !this.get('numValue')) {
return 'Fixed-text';

4
app/models/strain.js
View file

@ -13,7 +13,9 @@ export default DS.Model.extend({
createdAt: DS.attr('date'),
updatedAt: DS.attr('date'),
deletedAt: DS.attr('date'),
author: DS.attr('number'),
createdBy: DS.attr('number'),
updatedBy: DS.attr('number'),
deletedBy: DS.attr('number'),
totalMeasurements: DS.attr('number'),
fullName: Ember.computed('speciesName', 'strainName', function() {
return this.get('speciesName') + ' (' + this.get('strainName') + ')';