Validate the assigned role, and remove the :type activrecord enum

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 7294b07f50c2ad8da02084873d68631ff511dc76..1fe078ad9fca9a65d38b391a8bbdbea6c8752a14 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -37,13 +37,13 @@ class Issue < ActiveRecord::Base
 
   validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
   validates :reported_user_id, :presence => true
 
   validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
   validates :reported_user_id, :presence => true

+  validates :assigned_role, :presence => true, :inclusion => %w[administrator moderator]

 
   before_validation :set_default_assigned_role
   before_validation :set_reported_user
 
   # Check if more statuses are needed
   enum :status => %w[open ignored resolved]
 
   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]) }
 
 
   scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }