Simplify URL scheme name matching in OAuth callback URLs a little

[rails.git] / app / models / map_bug_comment.rb

diff --git a/app/models/map_bug_comment.rb b/app/models/map_bug_comment.rb
index 166e3fb42927f2308a025751c4dbb62a61681abf..9a130dd3469f82caca4c99d8460da27efff0f3ac 100644 (file)
--- a/app/models/map_bug_comment.rb
+++ b/app/models/map_bug_comment.rb
@@ -1,15 +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'
-
-   validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ]
+  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