X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cd2ca12d4235473cd3611b84e2a61649c17da2f6..957d75295b2c379b17e61a2a22ee28fb5f701589:/app/models/diary_entry.rb diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index c0fbac546..368ee3aca 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -1,28 +1,29 @@ class DiaryEntry < ActiveRecord::Base belongs_to :user, :counter_cache => true - belongs_to :language, :foreign_key => 'language_code' + 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 => ["active", "confirmed"] }).order(:id) }, :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_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 + validates :title, :body, :presence => true + validates :title, :length => 1..255 + validates :latitude, :allow_nil => true, + :numericality => { :greater_than_or_equal_to => -90, + :less_than_or_equal_to => 90 } + validates :longitude, :allow_nil => true, + :numericality => { :greater_than_or_equal_to => -180, + :less_than_or_equal_to => 180 } + validates :language, :user, :associated => true after_save :spam_check def body - RichText.new(read_attribute(:body_format), read_attribute(:body)) + RichText.new(self[:body_format], self[:body]) end -private + private def spam_check user.spam_check