Fix misspelling (lon -> lng)

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

diff --git a/app/models/note.rb b/app/models/note.rb
index f70e4f3bfdf229b227475cd18e4dcbbdf2a293b6..73207af0ff22f4e0a16d26f2b8cfdc3a95df0208 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -3,12 +3,12 @@ class Note < ActiveRecord::Base
 
   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_numericality_of :latitude, :only_integer => true
-  validates_numericality_of :longitude, :only_integer => true
-  validates_presence_of :closed_at if :status == "closed"
-  validates_inclusion_of :status, :in => %w(open closed hidden)
+  validates :id, :uniqueness => true, :presence => { :on => :update },
+                 :numericality => { :on => :update, :integer_only => true }
+  validates :latitude, :longitude, :numericality => { :only_integer => true }
+  validates :closed_at, :presence => true, :if => proc { :status == "closed" }
+  validates :status, :inclusion => %w(open closed hidden)
+
   validate :validate_position
 
   scope :visible, -> { where("status != 'hidden'") }
@@ -59,6 +59,6 @@ class Note < ActiveRecord::Base
 
   # Fill in default values for new notes
   def set_defaults
-    self.status = "open" unless self.attribute_present?(:status)
+    self.status = "open" unless attribute_present?(:status)
   end
 end