X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fd6f00b069af5a7b87227ea4c3401dc461d7311a..ea2baaee3b6cb6fbc92b87d313be00c69d3fc914:/app/models/diary_entry.rb diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 46d96fec7..33e95d175 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -1,12 +1,14 @@ class DiaryEntry < ActiveRecord::Base belongs_to :user + belongs_to :language, :foreign_key => 'language' + has_many :diary_comments, :include => :user, :conditions => ["users.visible = ?", true], :order => "diary_comments.id" 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,