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

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

diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index fb783281ed81dfa10cd5098d7c861bdc432f5455..adf569a03fe79a5d5827a5e33ddf4cdddb12e94d 100644 (file)
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -1,8 +1,29 @@
+# == Schema Information
+#
+# Table name: user_roles
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  role       :enum             not null
+#  created_at :datetime
+#  updated_at :datetime
+#  granter_id :integer          not null
+#
+# Indexes
+#
+#  user_roles_id_role_unique  (user_id,role) UNIQUE
+#
+# Foreign Keys
+#
+#  user_roles_granter_id_fkey  (granter_id => users.id)
+#  user_roles_user_id_fkey     (user_id => users.id)
+#
+
 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