Merge branch 'master' into next

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 00ee934f7a0fe430d1b54720fb85837e948206ab..dd068859a54dfb8bb8ded4abc4188605c9005a78 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -6,7 +6,7 @@
 #  reportable_type  :string           not null
 #  reportable_id    :integer          not null
 #  reported_user_id :integer
 #  reportable_type  :string           not null
 #  reportable_id    :integer          not null
 #  reported_user_id :integer

-#  status           :integer
+#  status           :enum             default("open"), not null

 #  assigned_role    :enum             not null
 #  resolved_at      :datetime
 #  resolved_by      :integer
 #  assigned_role    :enum             not null
 #  resolved_at      :datetime
 #  resolved_by      :integer


@@ -17,8 +17,10 @@
 #
 # Indexes
 #
 #
 # Indexes
 #

+#  index_issues_on_assigned_role                      (assigned_role)

 #  index_issues_on_reportable_type_and_reportable_id  (reportable_type,reportable_id)
 #  index_issues_on_reported_user_id                   (reported_user_id)
 #  index_issues_on_reportable_type_and_reportable_id  (reportable_type,reportable_id)
 #  index_issues_on_reported_user_id                   (reported_user_id)

+#  index_issues_on_status                             (status)

 #  index_issues_on_updated_by                         (updated_by)
 #
 # Foreign Keys
 #  index_issues_on_updated_by                         (updated_by)
 #
 # Foreign Keys


@@ -45,9 +47,6 @@ class Issue < ActiveRecord::Base
   before_validation :set_default_assigned_role
   before_validation :set_reported_user
 
   before_validation :set_default_assigned_role
   before_validation :set_reported_user
 

-  # Check if more statuses are needed
-  enum :status => %w[open ignored resolved]
-

   scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }
 
   def read_reports
   scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }
 
   def read_reports


@@ -95,7 +94,11 @@ class Issue < ActiveRecord::Base
   end
 
   def set_default_assigned_role
   end
 
   def set_default_assigned_role

-    role = %w[Note].include?(reportable.class.name) ? "moderator" : "administrator"
-    self.assigned_role = role if assigned_role.blank?
+    if assigned_role.blank?
+      self.assigned_role = case reportable
+                           when Note then "moderator"
+                           else "administrator"
+                           end
+    end

   end
 end
   end
 end