X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3700e6201b4b78a70bbb2941572edc985b63c2c..54164f6cc6c479e4dca0a717361b0850ba91f425:/app/controllers/user_roles_controller.rb

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index 732a2bb2c..cf5b4de9e 100644
--- 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
-  before_action :require_user
+
+  authorize_resource
+
   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]
@@ -26,16 +27,6 @@ class UserRolesController < ApplicationController
 
   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.
@@ -50,7 +41,7 @@ class UserRolesController < ApplicationController
   ##
   # 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
@@ -59,7 +50,7 @@ class UserRolesController < ApplicationController
   ##
   # 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