X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3b42fef34849eafb281512fc8794d8bfb138719..9f0ea60679c5e13ec321572f02afa5d265ce0c46:/app/models/diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 8894f4435..9146eb800 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,8 +1,24 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user
+  belongs_to :language, :foreign_key => 'language_code'
+  
+  has_many :comments, :class_name => "DiaryComment",
+                      :include => :user,
+                      :order => "diary_comments.id"
+  has_many :visible_comments, :class_name => "DiaryComment",
+                              :include => :user,
+                              :conditions => {
+                                :users => { :status => ["active", "confirmed" ] },
+                                :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_associated :user
+  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
 end