X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7a64ebe98265ff8ad6be5b8be9481661cd824f0f..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/controllers/user_roles_controller.rb?ds=inline diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index 732a2bb2c..fe4c855e3 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.