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

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

diff --git a/app/models/report.rb b/app/models/report.rb
index eda70f86516e2c65eb8ae4eba27bb2722ae9cdb4..346c5eea95c3d13205f1bb5ad5bc3d4b6ce9436e 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
 # 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
 #  details    :text             not null
 #  category   :string           not null
 #  created_at :datetime         not null


@@ -17,24 +17,24 @@
 #
 # Foreign Keys
 #
 #
 # 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
 
   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)
     case reportable.class.name
   validates :category, :presence => true
 
   def self.categories_for(reportable)
     case reportable.class.name

-    when "DiaryEntry" then %w[spam offensive threat other]
-    when "DiaryComment" then %w[spam offensive threat other]
+    when "DiaryEntry", "DiaryComment" then %w[spam offensive threat other]

     when "User" then %w[spam offensive threat vandal other]
     when "User" then %w[spam offensive threat vandal other]

-    when "Changeset" then %w[undiscussed_import mechanical_edit edit_error spam vandalism other]
-    when "Note" then %w[spam vandalism personal abusive other]
+    when "Note" then %w[spam personal abusive other]

     else %w[other]
     end
   end
     else %w[other]
     end
   end