Merge pull request #5406 from AntonKhorev/offline-message-oauth

[rails.git] / app / controllers / user_roles_controller.rb

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index b54cd0bd7a3eee82ccfecb01ce14882ba1d7c3cc..912453be8772891d4dcd3eed0e3b4685295cf509 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -9,20 +9,20 @@ class UserRolesController < ApplicationController
 
   before_action :lookup_user
   before_action :require_valid_role
 
   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
 
     @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
     # 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
     end
     redirect_to user_path(@user)
   end