X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/33c0f15990b215af60881f2ce6750e10dcc6284a..7599f98957334d1924550205f7ba12a726de7eb0:/app/models/note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index 0512639e1..c32b1679b 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -4,7 +4,7 @@ class Note < ActiveRecord::Base
   has_many :comments, :class_name => "NoteComment",
                       :foreign_key => :note_id,
                       :order => :created_at,
-                      :conditions => "visible = true AND body IS NOT NULL"
+                      :conditions => { :visible => true }
 
   validates_presence_of :id, :on => :update
   validates_uniqueness_of :id
@@ -14,14 +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?
-  end
-
-  # Fill in default values for new notes
-  def after_initialize
-    self.status = "open" unless self.attribute_present?(:status)
+    errors.add(:base, "Note is not in the world") unless in_world?
   end
 
   # Close a note
@@ -72,4 +71,11 @@ class Note < ActiveRecord::Base
   def author_name
     self.comments.first.author_name
   end
+
+private
+
+  # Fill in default values for new notes
+  def set_defaults
+    self.status = "open" unless self.attribute_present?(:status)
+  end
 end