X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b2af50f4a12da6f18c4b5d89ee1264e252c6da9..1bee96ede16e1dab41ad82efb9f2486da68a642f:/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..912453be8 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -1,41 +1,34 @@ class UserRolesController < ApplicationController + include UserMethods + 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] + before_action :not_in_role, :only => :create + before_action :in_role, :only => :destroy - def grant + def create @user.roles.create(:role => @role, :granter => current_user) redirect_to user_path(@user) end - def revoke + def destroy # 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 + UserRole.where(:user => @user, :role => @role).delete_all 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. @@ -50,7 +43,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 +52,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