X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cbe707b33e87418b8576cbc3fbd23bcd032153cb..04a87bb121b6fa0d169c27bbf9a4141292e801da:/app/models/issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1fe078ad9..d13f297a9 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -5,7 +5,7 @@
 #  id               :integer          not null, primary key
 #  reportable_type  :string           not null
 #  reportable_id    :integer          not null
-#  reported_user_id :integer          not null
+#  reported_user_id :integer
 #  status           :integer
 #  assigned_role    :enum             not null
 #  resolved_at      :datetime
@@ -36,8 +36,9 @@ class Issue < ActiveRecord::Base
   has_many :comments, :class_name => "IssueComment", :dependent => :destroy
 
   validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
-  validates :reported_user_id, :presence => true
-  validates :assigned_role, :presence => true, :inclusion => %w[administrator moderator]
+
+  ASSIGNED_ROLES = %w[administrator moderator].freeze
+  validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES
 
   before_validation :set_default_assigned_role
   before_validation :set_reported_user
@@ -92,7 +93,7 @@ class Issue < ActiveRecord::Base
   end
 
   def set_default_assigned_role
-    role = %w[Changeset Note].include?(reportable.class.name) ? "moderator" : "administrator"
+    role = %w[Note].include?(reportable.class.name) ? "moderator" : "administrator"
     self.assigned_role = role if assigned_role.blank?
   end
 end