Fix warning on unescaped hyphen in regexp

[rails.git] / app / models / diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 4affe8b597f1269e92839fa201ba9bc683ee93e7..e83dfb9ee47af81706161260781f7bb663a8fc88 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -26,11 +26,11 @@
 #  diary_entries_user_id_fkey        (user_id => users.id)
 #
 
 #  diary_entries_user_id_fkey        (user_id => users.id)
 #
 

-class DiaryEntry < ActiveRecord::Base
+class DiaryEntry < ApplicationRecord

   belongs_to :user, :counter_cache => true
   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
   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