Undo commenting out code

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

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

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

   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" ]

 
 

-  def author_name
-    if self.author_id.nil?
-      self.read_attribute(:author_name)
-    else
-      self.author.display_name
-    end
+  # Return the comment text
+  def body
+    RichText.new("text", read_attribute(:body))

   end
 end
   end
 end