X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38a610fd316c4d5143c2af2e71f73da6f249ac45..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 11a1dc41e..fe4c855e3 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -1,72 +1,58 @@ class UserRolesController < ApplicationController - layout 'site' + layout "site" - before_filter :authorize_web - before_filter :require_user - before_filter :lookup_this_user - before_filter :require_administrator - before_filter :require_valid_role - before_filter :not_in_role, :only => [:grant] - before_filter :in_role, :only => [:revoke] + before_action :authorize_web + + authorize_resource + + before_action :lookup_user + before_action :require_valid_role + before_action :not_in_role, :only => [:grant] + before_action :in_role, :only => [:revoke] def grant - @this_user.roles.create({ - :role => @role, :granter_id => @user.id - }, :without_protection => true) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + @user.roles.create(:role => @role, :granter => current_user) + redirect_to user_path(@user) end def revoke - UserRole.delete_all({:user_id => @this_user.id, :role => @role}) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name - 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' - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + # checks that administrator role is not revoked from current user + 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 end + redirect_to user_path(@user) end - ## - # ensure that there is a "this_user" instance variable - def lookup_this_user - unless @this_user = User.find_by_display_name(params[:display_name]) - @not_found_user = params[:display_name] - render :template => 'user/no_such_user', :status => :not_found - end - end + private ## - # require that the given role is valid. the role is a URL + # require that the given role is valid. the role is a URL # parameter, so should always be present. def require_valid_role @role = params[:role] unless UserRole::ALL_ROLES.include?(@role) - flash[:error] = t('user_role.filter.not_a_role', :role => @role) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + flash[:error] = t("user_role.filter.not_a_role", :role => @role) + redirect_to user_path(@user) end end ## # checks that the user doesn't already have this role def not_in_role - if @this_user.has_role? @role - flash[:error] = t('user_role.filter.already_has_role', :role => @role) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + if @user.has_role? @role + flash[:error] = t("user_role.filter.already_has_role", :role => @role) + redirect_to user_path(@user) end end ## # checks that the user already has this role def in_role - unless @this_user.has_role? @role - flash[:error] = t('user_role.filter.doesnt_have_role', :role => @role) - redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name + unless @user.has_role? @role + flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role) + redirect_to user_path(@user) end end end