diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 1429f0e83..274702c66 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -374,7 +374,7 @@ class MyModule < ApplicationRecord x: self.x, y: self.y) clone.save - + # Remove the automatically generated protocol, # & clone the protocol instead clone.protocol.destroy diff --git a/app/models/sample_my_module.rb b/app/models/sample_my_module.rb index 878daa45c..5ab6b0868 100644 --- a/app/models/sample_my_module.rb +++ b/app/models/sample_my_module.rb @@ -11,13 +11,9 @@ class SampleMyModule < ApplicationRecord foreign_key: 'assigned_by_id', class_name: 'User', optional: true - belongs_to :sample, - inverse_of: :sample_my_modules, - optional: true - belongs_to :my_module, - inverse_of: :sample_my_modules, - optional: true - + belongs_to :sample, inverse_of: :sample_my_modules, optional: true + belongs_to :my_module, inverse_of: :sample_my_modules, optional: true + def increment_nr_of_module_samples my_module.increment!(:nr_of_assigned_samples) sample.increment!(:nr_of_modules_assigned_to) diff --git a/app/models/token.rb b/app/models/token.rb index d1fb00005..71844f2a7 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -1,11 +1,10 @@ class Token < ApplicationRecord - validates :token, presence: true - validates :ttl, presence: true + validates :token, presence: true + validates :ttl, presence: true - belongs_to :user, + belongs_to :user, foreign_key: 'user_id', class_name: 'User', inverse_of: :tokens, optional: true - end