turning the session off for the changeset controller, to come in line with the other...

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 8568160774f8d671dfefd8a8746a5eefbfdd3649..4b2058b9d9b7b684426b5c82d223596b4e371288 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -2,9 +2,11 @@ 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_length_of :title, :within => 1..255
+  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