X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..899891fe8a16934ab98b16456ea95d9f9c81587d:/app/models/diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index fa3c4c848..368ee3aca 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -7,19 +7,20 @@ class DiaryEntry < ActiveRecord::Base
 
   scope :visible, -> { where(:visible => true) }
 
-  validates_presence_of :title, :body
-  validates_length_of :title, :within => 1..255
-  # validates_length_of :language, :within => 2..5, :allow_nil => false
-  validates_numericality_of :latitude, :allow_nil => true,
-                                       :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90
-  validates_numericality_of :longitude, :allow_nil => true,
-                                        :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
-  validates_associated :language
+  validates :title, :body, :presence => true
+  validates :title, :length => 1..255
+  validates :latitude, :allow_nil => true,
+                       :numericality => { :greater_than_or_equal_to => -90,
+                                          :less_than_or_equal_to => 90 }
+  validates :longitude, :allow_nil => true,
+                        :numericality => { :greater_than_or_equal_to => -180,
+                                           :less_than_or_equal_to => 180 }
+  validates :language, :user, :associated => true
 
   after_save :spam_check
 
   def body
-    RichText.new(read_attribute(:body_format), read_attribute(:body))
+    RichText.new(self[:body_format], self[:body])
   end
 
   private