Fix note commenting

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

diff --git a/app/models/note.rb b/app/models/note.rb
index 76c5e53081158809f55f381e3457719f2cf9e38a..27357e58a86830620d6f5224f9a32a7ab7c000ae 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -1,10 +1,7 @@
 class Note < ActiveRecord::Base
   include GeoRecord
 
 class Note < ActiveRecord::Base
   include GeoRecord
 

-  has_many :comments, :class_name => "NoteComment",
-                      :foreign_key => :note_id,
-                      :order => :created_at,
-                      :conditions => { :visible => true }
+  has_many :comments, -> { where(:visible => true).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id

 
   validates_presence_of :id, :on => :update
   validates_uniqueness_of :id
 
   validates_presence_of :id, :on => :update
   validates_uniqueness_of :id


@@ -14,11 +11,14 @@ class Note < ActiveRecord::Base
   validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
   validate :validate_position
 
   validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
   validate :validate_position
 

+  scope :visible, -> { where("status != 'hidden'") }
+  scope :invisible, -> { where("status = 'hidden'") }
+

   after_initialize :set_defaults
 
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
   after_initialize :set_defaults
 
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position

-    errors.add_to_base("Note is not in the world") unless in_world?
+    errors.add(:base, "Note is not in the world") unless in_world?

   end
 
   # Close a note
   end
 
   # Close a note


@@ -28,26 +28,21 @@ class Note < ActiveRecord::Base
     self.save
   end
 
     self.save
   end
 

-  # Return a flattened version of the comments for a note
-  def flatten_comment(separator_char, upto_timestamp = :nil)
-    resp = ""
-    comment_no = 1
-    self.comments.each do |comment|
-      next if upto_timestamp != :nil and comment.created_at > upto_timestamp
-      resp += (comment_no == 1 ? "" : separator_char)
-      resp += comment.body if comment.body
-      resp += " [ " 
-      resp += comment.author_name if comment.author_name
-      resp += " " + comment.created_at.to_s + " ]"
-      comment_no += 1
-    end
-
-    return resp
+  # Reopen a note
+  def reopen
+    self.status = "open"
+    self.closed_at = nil
+    self.save

   end
 
   # Check if a note is visible
   def visible?
   end
 
   # Check if a note is visible
   def visible?

-    return status != "hidden"
+    status != "hidden"
+  end
+
+  # Check if a note is closed
+  def closed?
+    not closed_at.nil?

   end
 
   # Return the author object, derived from the first comment
   end
 
   # Return the author object, derived from the first comment


@@ -60,16 +55,6 @@ class Note < ActiveRecord::Base
     self.comments.first.author_ip
   end
 
     self.comments.first.author_ip
   end
 

-  # Return the author id, derived from the first comment
-  def author_id
-    self.comments.first.author_id
-  end
-
-  # Return the author name, derived from the first comment
-  def author_name
-    self.comments.first.author_name
-  end
-

 private
 
   # Fill in default values for new notes
 private
 
   # Fill in default values for new notes