X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6a5749c55c7a93a25054dc6dd76e1c4b88e37b2c..5a2ad3655bfb690ad98cd66877f35707783e0c9d:/app/models/diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 856816077..705438213 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,11 +1,18 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user
+  belongs_to :language, :foreign_key => 'language_code'
+  
   has_many :diary_comments, :include => :user,
-                            :conditions => "users.visible = 1",
-                            :order => "id"
+                            :conditions => ["users.visible = ?", true],
+                            :order => "diary_comments.id"
 
   validates_presence_of :title, :body
-  validates_numericality_of :latitude, :allow_nil => true
-  validates_numericality_of :longitude, :allow_nil => true
+  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 :user
+  validates_associated :language
 end