more diary entry tests, and a minor fix to the relation member that makes the code...

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 5b3d34766d06a17e86fc2a61577829c9e7bc8f41..c20788fbbe7858b6056d5773ae2183a5941b0d2e 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,8 +1,12 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user

-  has_many :diary_comments, :order => "id"
+  has_many :diary_comments, :include => :user,
+                            :conditions => "users.visible = 1",
+                            :order => "diary_comments.id"

 
   validates_presence_of :title, :body
 
   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
   validates_numericality_of :latitude, :allow_nil => true
   validates_numericality_of :longitude, :allow_nil => true
   validates_associated :user