Resyncing from head 10895:11795

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 8894f44355cddb66feb936e40a3eb61e85ef2668..c20788fbbe7858b6056d5773ae2183a5941b0d2e 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,7 +1,12 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user
+  has_many :diary_comments, :include => :user,
+                            :conditions => "users.visible = 1",
+                            :order => "diary_comments.id"
 
   validates_presence_of :title, :body
+  validates_length_of :title, :within => 1..255
+  validates_length_of :language, :within => 2..3
   validates_numericality_of :latitude, :allow_nil => true
   validates_numericality_of :longitude, :allow_nil => true
   validates_associated :user