X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c8ee1351049ef1bb4d7b50d071b2a96154266d1d..1340fca8f17e4e3cce211e6eafed18cde7f57386:/app/models/diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 8063372da..1d836353f 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,15 +1,28 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user
-  has_many :diary_comments, :include => :user,
-                            :conditions => "users.visible = 1",
-                            :order => "diary_comments.id"
+  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"
+
+  scope :visible, where(:visible => true)
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
-  validates_length_of :language, :within => 2..3, :allow_nil => true
+  #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
+
+  attr_accessible :title, :body, :language_code, :latitude, :longitude
 end