Merge branch 'master' into moderation

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 963a27a6e8e5da9d4a940b4570d72bbbd05df886..472c860c68b29ccc476256d5053a1026e83e46e2 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,6 +1,6 @@
 class Issue < ActiveRecord::Base
   belongs_to :reportable, :polymorphic => true
-  belongs_to :user, :class_name => "User", :foreign_key => :reported_user_id
+  belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id
   belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by
 
   has_many :reports, :dependent => :destroy
@@ -9,11 +9,13 @@ class Issue < ActiveRecord::Base
   validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
   validates :reported_user_id, :presence => true
 
+  before_validation :set_reported_user
+
   # Check if more statuses are needed
-  enum :status => %w(open ignored resolved)
-  enum :type => %w(administrator moderator)
+  enum :status => %w[open ignored resolved]
+  enum :type => %w[administrator moderator]
 
-  scope :with_status, -> (issue_status) { where(:status => statuses[issue_status]) }
+  scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }
 
   def read_reports
     resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil
@@ -45,4 +47,17 @@ class Issue < ActiveRecord::Base
       transitions :from => :ignored, :to => :open
     end
   end
+
+  private
+
+  def set_reported_user
+    self.reported_user = case reportable.class.name
+                         when "User"
+                           reportable
+                         when "Note"
+                           reportable.author
+                         else
+                           reportable.user
+                         end
+  end
 end