DateTime => Time for consistency in changeset code, ok by shaun.

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 8568160774f8d671dfefd8a8746a5eefbfdd3649..8063372da9065c67c18c15a4f0dce2847cc39485 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -2,10 +2,14 @@ class DiaryEntry < ActiveRecord::Base
   belongs_to :user
   has_many :diary_comments, :include => :user,
                             :conditions => "users.visible = 1",
   belongs_to :user
   has_many :diary_comments, :include => :user,
                             :conditions => "users.visible = 1",

-                            :order => "id"
+                            :order => "diary_comments.id"

 
   validates_presence_of :title, :body
 
   validates_presence_of :title, :body

-  validates_numericality_of :latitude, :allow_nil => true
-  validates_numericality_of :longitude, :allow_nil => true
+  validates_length_of :title, :within => 1..255
+  validates_length_of :language, :within => 2..3, :allow_nil => true
+  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
 end
   validates_associated :user
 end