X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/873ac155cabfb1aab8d887d07bc8389617d3f843..d2dc1ff8978a3ed9636c172a7e3cfb8e3d83410b:/app/models/diary_entry.rb diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index c49c2d427..089c7e6c6 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -2,8 +2,8 @@ # # Table name: diary_entries # -# id :integer not null, primary key -# user_id :integer not null +# id :bigint(8) not null, primary key +# user_id :bigint(8) not null # title :string not null # body :text not null # created_at :datetime not null @@ -26,19 +26,19 @@ # diary_entries_user_id_fkey (user_id => users.id) # -class DiaryEntry < ActiveRecord::Base +class DiaryEntry < ApplicationRecord belongs_to :user, :counter_cache => true - belongs_to :language, :foreign_key => "language_code" + belongs_to :language, :foreign_key => "language_code", :inverse_of => :diary_entries - has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment" + has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment", :inverse_of => :diary_entry has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => %w[active confirmed] }).order(:id) }, :class_name => "DiaryComment" has_many :subscriptions, :class_name => "DiaryEntrySubscription" has_many :subscribers, :through => :subscriptions, :source => :user scope :visible, -> { where(:visible => true) } - validates :title, :presence => true, :length => 1..255, :invalid_chars => true - validates :body, :presence => true, :invalid_chars => true + validates :title, :presence => true, :length => 1..255, :characters => true + validates :body, :presence => true, :characters => true validates :latitude, :allow_nil => true, :numericality => { :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90 } @@ -50,7 +50,7 @@ class DiaryEntry < ActiveRecord::Base after_save :spam_check def body - RichText.new(self[:body_format], self[:body]) + @body ||= RichText.new(self[:body_format], self[:body]) end private