Standardise on double quoted strings

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

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 0500acb8bf2b11ffb12eda1c54bac03210ef5143..192064864e4de10d78f7e408ae243cb60ce7787d 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -1,5 +1,5 @@
 class NoteComment < ActiveRecord::Base
 class NoteComment < ActiveRecord::Base

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

   belongs_to :author, :class_name => "User", :foreign_key => :author_id
 
   validates_presence_of :id, :on => :update
   belongs_to :author, :class_name => "User", :foreign_key => :author_id
 
   validates_presence_of :id, :on => :update


@@ -8,16 +8,8 @@ class NoteComment < ActiveRecord::Base
   validates_associated :note
   validates_presence_of :visible
   validates_associated :author
   validates_associated :note
   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)
-    else
-      self.author.display_name
-    end
-  end
+  validates_inclusion_of :event, :in => %w(opened closed reopened commented hidden)
+  validates_format_of :body, :with => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/

 
   # Return the comment text
   def body
 
   # Return the comment text
   def body