X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2e1d9f3348c0daa482397049d009e26bbedc00bd..43f39c50a358bef5be0847888318a64f162c9faf:/app/models/note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index 76c5e5308..14806be26 100644
--- 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
@@ -37,7 +39,7 @@ class Note < ActiveRecord::Base
       resp += (comment_no == 1 ? "" : separator_char)
       resp += comment.body if comment.body
       resp += " [ " 
-      resp += comment.author_name if comment.author_name
+      resp += comment.author.display_name if comment.author
       resp += " " + comment.created_at.to_s + " ]"
       comment_no += 1
     end
@@ -60,16 +62,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