X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5f33656c8d6725969ac63dbfe038633ad0e4352f..9d5b81094c69a02782faead1528ef32ffcc48aea:/app/controllers/user_roles_controller.rb?ds=sidebyside diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index cb0425f32..7dad891e2 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -22,6 +22,9 @@ class UserRolesController < ApplicationController 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 @user.administrator? flash[:error] = t'user_role.filter.not_an_administrator' @@ -29,14 +32,6 @@ class UserRolesController < ApplicationController end end - ## - # ensure that there is a "this_user" instance variable - def lookup_this_user - @this_user = User.find_by_display_name(params[:display_name]) - rescue ActiveRecord::RecordNotFound - redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user - end - ## # require that the given role is valid. the role is a URL # parameter, so should always be present.