X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cfbdd3f7e1c688e2c875ded9fd847fcc1c3a4caf..e198ec6252aaacbece6c3d3a6e7957588b619b8a:/app/models/diary_entry.rb diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 8894f4435..8063372da 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -1,8 +1,15 @@ class DiaryEntry < ActiveRecord::Base belongs_to :user + has_many :diary_comments, :include => :user, + :conditions => "users.visible = 1", + :order => "diary_comments.id" 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