X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..6aca6cfabf21da48567e8197457dae8785b7324d:/app/models/note.rb diff --git a/app/models/note.rb b/app/models/note.rb index a2937074c..c32b1679b 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -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