Always get the bug commenter name from the user if there is one

[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..50bfe3bef40c6af44ae3cc69f03e09f70a24a37b 100644 (file)
--- a/app/models/map_bug_comment.rb
+++ b/app/models/map_bug_comment.rb
@@ -1,15 +1,20 @@
 class MapBugComment < ActiveRecord::Base
 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'
 
   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" ]
-
+  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
 
   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)
+    else
+      self.user.display_name
+    end
+  end

 end
 end