Merge branch 'master' into moderation

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 567ee819e30e99b011b6db6d01a09a387c631bfa..d13f297a9a443e007540f9e8f15b1f38317d1ebb 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -5,15 +5,15 @@
 #  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
-#  issue_type       :string
+#  assigned_role    :enum             not null
 #  resolved_at      :datetime
 #  resolved_by      :integer
 #  updated_by       :integer
+#  reports_count    :integer          default(0)
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
-#  reports_count    :integer          default(0)
 #
 # Indexes
 #
@@ -36,13 +36,15 @@ 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
 
+  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
 
   # Check if more statuses are needed
   enum :status => %w[open ignored resolved]
-  enum :type => %w[administrator moderator]
 
   scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }
 
@@ -89,4 +91,9 @@ class Issue < ActiveRecord::Base
                            reportable.user
                          end
   end
+
+  def set_default_assigned_role
+    role = %w[Note].include?(reportable.class.name) ? "moderator" : "administrator"
+    self.assigned_role = role if assigned_role.blank?
+  end
 end