Adding the ability to see the min/max lat/lon for a changeset in the data browser...

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index fe48ee8dce01b50213dd72c05878f2e78c60c67c..4b2058b9d9b7b684426b5c82d223596b4e371288 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,10 +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_length_of :title, :within => 1..255
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255

-  validates_length_of :language, :within => 2..3
+  validates_length_of :language, :within => 2..3, :allow_nil => true

   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