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

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

diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index fb783281ed81dfa10cd5098d7c861bdc432f5455..967850145f838b4dcff1af82858235dbcecebec7 100644 (file)
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -1,8 +1,8 @@
 class UserRole < ActiveRecord::Base
   belongs_to :user
+  belongs_to :granter, :class_name => "User"
 
-  ALL_ROLES = ['administrator', 'moderator']
+  ALL_ROLES = %w[administrator moderator].freeze
 
-  validates_inclusion_of :role, :in => ALL_ROLES
-  validates_uniqueness_of :role, :scope => :user_id
+  validates :role, :inclusion => ALL_ROLES, :uniqueness => { :scope => :user_id }
 end