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

[rails.git] / app / controllers / user_roles_controller.rb

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index 732a2bb2c24a48c19e49324c75e3a5eea12050e0..fe4c855e3d827e9696e4233b2f86c57ccd4c7b16 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -2,9 +2,10 @@ class UserRolesController < ApplicationController
   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web

-  before_action :require_user
+
+  authorize_resource
+

   before_action :lookup_user
   before_action :lookup_user

-  before_action :require_administrator

   before_action :require_valid_role
   before_action :not_in_role, :only => [:grant]
   before_action :in_role, :only => [:revoke]
   before_action :require_valid_role
   before_action :not_in_role, :only => [:grant]
   before_action :in_role, :only => [:revoke]


@@ -26,16 +27,6 @@ class UserRolesController < ApplicationController
 
   private
 
 
   private
 

-  ##
-  # require that the user is an administrator, or fill out a helpful error message
-  # and return them to theuser page.
-  def require_administrator
-    unless current_user.administrator?
-      flash[:error] = t "user_role.filter.not_an_administrator"
-      redirect_to user_path(@user)
-    end
-  end
-

   ##
   # require that the given role is valid. the role is a URL
   # parameter, so should always be present.
   ##
   # require that the given role is valid. the role is a URL
   # parameter, so should always be present.