X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63e9c4771a02ecf69a692df3a6df3d236b0c214b..ae844f3260d65feaf4f827c0ede20905b1cfd036:/app/models/map_bug_comment.rb diff --git a/app/models/map_bug_comment.rb b/app/models/map_bug_comment.rb index 50bfe3bef..9a130dd34 100644 --- a/app/models/map_bug_comment.rb +++ b/app/models/map_bug_comment.rb @@ -1,20 +1,19 @@ class MapBugComment < ActiveRecord::Base set_table_name 'map_bug_comment' - belongs_to :map_bug, :foreign_key => 'bug_id' - belongs_to :user, :foreign_key => 'commenter_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 commenter_name - if self.commenter_id.nil? - self.read_attribute(:commenter_name) + def author_name + if self.author_id.nil? + self.read_attribute(:author_name) else - self.user.display_name + self.author.display_name end end end