Fix search result link behavior (systemed/iD#1329)

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

diff --git a/app/models/note.rb b/app/models/note.rb
index 76c5e53081158809f55f381e3457719f2cf9e38a..490ff43cb8299beba1259b405bc03070d6d06818 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -14,11 +14,13 @@ class Note < ActiveRecord::Base
   validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
   validate :validate_position
 
+  attr_accessible :lat, :lon
+
   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
@@ -28,26 +30,14 @@ class Note < ActiveRecord::Base
     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
-  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
@@ -60,16 +50,6 @@ class Note < ActiveRecord::Base
     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