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

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

diff --git a/app/models/report.rb b/app/models/report.rb
index 63296a0948b9aae2a3ff7d1ac93423d9cf080e25..1475197fe34b8e87ab99c550f6d8efb3bdd7e245 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -21,22 +21,23 @@
 #  reports_user_id_fkey   (user_id => users.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 :issue, :presence => true
-  validates :user, :presence => true
-  validates :details, :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 "Note" then %w[spam personal abusive other]
     else %w[other]
     end
   end
     when "User" then %w[spam offensive threat vandal other]
     when "Note" then %w[spam personal abusive other]
     else %w[other]
     end
   end

+
+  def details
+    RichText.new("markdown", self[:details])
+  end

 end
 end