X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c771557b38a2f935ea79d113386c759636f4e31f..e0706f06b19b04295cf8c87acceb536d96eaf427:/app/models/diary_entry.rb?ds=sidebyside diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index dd1f9882a..fa3c4c848 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -1,11 +1,30 @@ class DiaryEntry < ActiveRecord::Base - belongs_to :user - has_many :diary_comments, :include => :user, - :conditions => "users.visible = 1", - :order => "diary_comments.id" + belongs_to :user, :counter_cache => true + belongs_to :language, :foreign_key => "language_code" + + has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment" + has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => %w(active confirmed) }).order(:id) }, :class_name => "DiaryComment" + + scope :visible, -> { where(:visible => true) } validates_presence_of :title, :body - validates_numericality_of :latitude, :allow_nil => true - validates_numericality_of :longitude, :allow_nil => true - validates_associated :user + validates_length_of :title, :within => 1..255 + # 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 :language + + after_save :spam_check + + def body + RichText.new(read_attribute(:body_format), read_attribute(:body)) + end + + private + + def spam_check + user.spam_check + end end