X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..07211afe3e584167d17b31fc0fde198911abafaa:/app/models/diary_entry.rb diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 46d96fec7..705438213 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -1,15 +1,18 @@ class DiaryEntry < ActiveRecord::Base belongs_to :user + belongs_to :language, :foreign_key => 'language_code' + 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, :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180 validates_associated :user + validates_associated :language end