X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eac7348ad2793cb3ad72c68bef84ff863af92d5f..6cb69b5e4be820b3f30d0f9eef9bbeb39fab5231:/app/models/map_bug_comment.rb diff --git a/app/models/map_bug_comment.rb b/app/models/map_bug_comment.rb index 9839cae45..9a130dd34 100644 --- a/app/models/map_bug_comment.rb +++ b/app/models/map_bug_comment.rb @@ -1,14 +1,19 @@ class MapBugComment < ActiveRecord::Base - set_table_name 'map_bug_comment' - belongs_to :map_bug, :foreign_key => 'bug_id' - - + belongs_to :map_bug, :foreign_key => :bug_id + belongs_to :author, :class_name => "User", :foreign_key => :author_id + validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ] validates_presence_of :id, :on => :update validates_uniqueness_of :id validates_presence_of :visible - validates_presence_of :date_created + def author_name + if self.author_id.nil? + self.read_attribute(:author_name) + else + self.author.display_name + end + end end