X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59e9203a0ac7d2ce1238055879577656c57dc216..3d79f9fd88ab2784b292c8eafc46070472b2a4c9:/app/controllers/user_roles_controller.rb diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index cf5b4de9e..912453be8 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -1,4 +1,6 @@ class UserRolesController < ApplicationController + include UserMethods + layout "site" before_action :authorize_web @@ -7,20 +9,20 @@ class UserRolesController < ApplicationController before_action :lookup_user 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