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

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

diff --git a/app/models/report.rb b/app/models/report.rb
index fcfa61b98a794cd74a6d0833afbd991076be6bca..9afedb04ee29a68a0cabf434b549a22ff6dbd1f8 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -3,8 +3,8 @@
 # Table name: reports
 #
 #  id         :integer          not null, primary key
-#  issue_id   :integer
-#  user_id    :integer
+#  issue_id   :integer          not null
+#  user_id    :integer          not null
 #  details    :text             not null
 #  category   :string           not null
 #  created_at :datetime         not null
@@ -17,15 +17,17 @@
 #
 # Foreign Keys
 #
-#  reports_issue_id_fkey  (issue_id => issues.id) ON DELETE => cascade
-#  reports_user_id_fkey   (user_id => users.id) ON DELETE => cascade
+#  reports_issue_id_fkey  (issue_id => issues.id)
+#  reports_user_id_fkey   (user_id => users.id)
 #
 
-class Report < ActiveRecord::Base
+class Report < ApplicationRecord
   belongs_to :issue, :counter_cache => true
   belongs_to :user
 
-  validates :details, :presence => true
+  validates :issue, :presence => true
+  validates :user, :presence => true
+  validates :details, :presence => true, :characters => true
   validates :category, :presence => true
 
   def self.categories_for(reportable)
@@ -33,7 +35,7 @@ class Report < ActiveRecord::Base
     when "DiaryEntry" then %w[spam offensive threat other]
     when "DiaryComment" then %w[spam offensive threat other]
     when "User" then %w[spam offensive threat vandal other]
-    when "Note" then %w[spam vandalism personal abusive other]
+    when "Note" then %w[spam personal abusive other]
     else %w[other]
     end
   end