Tidy up the note_comment model a bit

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 5e04723bdda191d70aff16b5c4c04c5ce082767b..bcbcf79beb0aaf472a6bf5217dcfa846b24b7398 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -1,12 +1,16 @@
 class NoteComment < ActiveRecord::Base
 class NoteComment < ActiveRecord::Base

-  belongs_to :note, :foreign_key => :bug_id
+  belongs_to :note, :foreign_key => :note_id

   belongs_to :author, :class_name => "User", :foreign_key => :author_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 :id, :on => :update
   validates_uniqueness_of :id

+  validates_presence_of :note_id
+  validates_associated :note

   validates_presence_of :visible
   validates_presence_of :visible

+  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)
   def author_name
     if self.author_id.nil?
       self.read_attribute(:author_name)