Merge remote-tracking branch 'upstream/pull/4564'

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

diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index f3d48cade4bcfeb53df717b509cc0ab90ac45d39..332848e420ffec509d270267e81f281ee4502bef 100644 (file)
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -19,11 +19,11 @@
 #  user_roles_user_id_fkey     (user_id => users.id)
 #
 
 #  user_roles_user_id_fkey     (user_id => users.id)
 #
 

-class UserRole < ActiveRecord::Base
+class UserRole < ApplicationRecord

   belongs_to :user
   belongs_to :granter, :class_name => "User"
 
   belongs_to :user
   belongs_to :granter, :class_name => "User"
 

-  ALL_ROLES = %w[administrator moderator].freeze
+  ALL_ROLES = %w[administrator moderator importer].freeze

 
   validates :role, :inclusion => ALL_ROLES, :uniqueness => { :scope => :user_id }
 end
 
   validates :role, :inclusion => ALL_ROLES, :uniqueness => { :scope => :user_id }
 end