Merge pull request #4197 from AntonKhorev/user-resources

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 8a99c7b2ce461fdc80ebed2987149f4c2e8e93b1..05f5044c5db779b232da81bd6e3bbdf0ba31d5b5 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -2,9 +2,9 @@
 #
 # Table name: diary_comments
 #
 #
 # Table name: diary_comments
 #

-#  id             :integer          not null, primary key
-#  diary_entry_id :integer          not null
-#  user_id        :integer          not null
+#  id             :bigint(8)        not null, primary key
+#  diary_entry_id :bigint(8)        not null
+#  user_id        :bigint(8)        not null

 #  body           :text             not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  body           :text             not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null


@@ -22,11 +22,13 @@
 #  diary_comments_user_id_fkey         (user_id => users.id)
 #
 
 #  diary_comments_user_id_fkey         (user_id => users.id)
 #
 

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

   belongs_to :user
   belongs_to :diary_entry
 
   belongs_to :user
   belongs_to :diary_entry
 

-  validates :body, :presence => true
+  scope :visible, -> { where(:visible => true) }
+
+  validates :body, :presence => true, :characters => true

   validates :diary_entry, :user, :associated => true
 
   after_save :spam_check
   validates :diary_entry, :user, :associated => true
 
   after_save :spam_check