Merge remote-tracking branch 'upstream/pull/4996'

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

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 388f890a67c4fb5ea0939be59cef429475e2ca0a..d318c5e95aa8272332765437da303c1234970fd6 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -13,9 +13,10 @@
 #
 # Indexes
 #
 #
 # Indexes
 #

-#  index_note_comments_on_body        (to_tsvector('english'::regconfig, body)) USING gin
-#  index_note_comments_on_created_at  (created_at)
-#  note_comments_note_id_idx          (note_id)
+#  index_note_comments_on_author_id_and_created_at  (author_id,created_at)
+#  index_note_comments_on_body                      (to_tsvector('english'::regconfig, body)) USING gin
+#  index_note_comments_on_created_at                (created_at)
+#  note_comments_note_id_idx                        (note_id)

 #
 # Foreign Keys
 #
 #
 # Foreign Keys
 #


@@ -23,13 +24,13 @@
 #  note_comments_note_id_fkey    (note_id => notes.id)
 #
 
 #  note_comments_note_id_fkey    (note_id => notes.id)
 #
 

-class NoteComment < ActiveRecord::Base
-  belongs_to :note, :foreign_key => :note_id, :touch => true
-  belongs_to :author, :class_name => "User", :foreign_key => :author_id
+class NoteComment < ApplicationRecord
+  belongs_to :note, :touch => true
+  belongs_to :author, :class_name => "User", :optional => true, :counter_cache => true

 
   validates :id, :uniqueness => true, :presence => { :on => :update },
 
   validates :id, :uniqueness => true, :presence => { :on => :update },

-                 :numericality => { :on => :update, :integer_only => true }
-  validates :note, :presence => true, :associated => true
+                 :numericality => { :on => :update, :only_integer => true }
+  validates :note, :associated => true

   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]
   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]