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

[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..469b2c40b626845191e7a5265e873c340da7c4f4 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -1,10 +1,13 @@
 class UserRolesController < ApplicationController
 class UserRolesController < ApplicationController

+  include UserMethods
+

   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]


@@ -19,23 +22,13 @@ class UserRolesController < ApplicationController
     if current_user == @user && @role == "administrator"
       flash[:error] = t("user_role.filter.not_revoke_admin_current_user")
     else
     if current_user == @user && @role == "administrator"
       flash[:error] = t("user_role.filter.not_revoke_admin_current_user")
     else

-      UserRole.where(:user_id => @user.id, :role => @role).delete_all
+      UserRole.where(:user => @user, :role => @role).delete_all

     end
     redirect_to user_path(@user)
   end
 
   private
 
     end
     redirect_to user_path(@user)
   end
 
   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.


@@ -50,7 +43,7 @@ class UserRolesController < ApplicationController
   ##
   # checks that the user doesn't already have this role
   def not_in_role
   ##
   # checks that the user doesn't already have this role
   def not_in_role

-    if @user.has_role? @role
+    if @user.role? @role

       flash[:error] = t("user_role.filter.already_has_role", :role => @role)
       redirect_to user_path(@user)
     end
       flash[:error] = t("user_role.filter.already_has_role", :role => @role)
       redirect_to user_path(@user)
     end


@@ -59,7 +52,7 @@ class UserRolesController < ApplicationController
   ##
   # checks that the user already has this role
   def in_role
   ##
   # checks that the user already has this role
   def in_role

-    unless @user.has_role? @role
+    unless @user.role? @role

       flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)
       redirect_to user_path(@user)
     end
       flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)
       redirect_to user_path(@user)
     end