diff options
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/note.rb | 2 | ||||
-rw-r--r-- | app/models/task.rb | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index b3809ad81e0..73412024f4e 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -37,6 +37,8 @@ class Note < ActiveRecord::Base belongs_to :author, class_name: "User" belongs_to :updated_by, class_name: "User" + has_many :tasks, dependent: :delete_all + delegate :name, to: :project, prefix: true delegate :name, :email, to: :author, prefix: true diff --git a/app/models/task.rb b/app/models/task.rb index c9881991e38..38c6637e456 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -8,6 +8,7 @@ # target_id :integer not null # target_type :string not null # author_id :integer +# note_id :integer # action :integer # state :string not null # created_at :datetime @@ -19,6 +20,7 @@ class Task < ActiveRecord::Base MENTIONED = 2 belongs_to :author, class_name: "User" + belongs_to :note belongs_to :project belongs_to :target, polymorphic: true, touch: true belongs_to :user @@ -52,6 +54,10 @@ class Task < ActiveRecord::Base target.respond_to? :title end + def note_text + note.try(:note) + end + def target_iid target.respond_to?(:iid) ? target.iid : target_id end |