X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/99df5f6179b63bac322ddcc6581350082f4b8846..948fd8c8faf1016d:/app/models/issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index b6a531824..472c860c6 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -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