X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/18883b59c88940b9bd323756e60603302f185dfd..5c53bb78ab8a7292b489d7f8d1f38ba17a0287e6:/app/models/note_comment.rb?ds=sidebyside diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb index bcbcf79be..07d43cd74 100644 --- a/app/models/note_comment.rb +++ b/app/models/note_comment.rb @@ -1,5 +1,5 @@ class NoteComment < ActiveRecord::Base - belongs_to :note, :foreign_key => :note_id + belongs_to :note, :foreign_key => :note_id, :touch => true belongs_to :author, :class_name => "User", :foreign_key => :author_id validates_presence_of :id, :on => :update @@ -10,12 +10,8 @@ class NoteComment < ActiveRecord::Base validates_associated :author validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ] - # Return the author name - def author_name - if self.author_id.nil? - self.read_attribute(:author_name) - else - self.author.display_name - end + # Return the comment text + def body + RichText.new("text", read_attribute(:body)) end end