X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..601f1609ab112b8fea55124dd6c04b3964992759:/app/models/diary_entry.rb?ds=sidebyside diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index a66eb599d..368ee3aca 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -1,25 +1,26 @@ 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 => %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