Merge pull request #4316 from AntonKhorev/block-reason-max-length

[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 fe4c855e3d827e9696e4233b2f86c57ccd4c7b16..912453be8772891d4dcd3eed0e3b4685295cf509 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -1,4 +1,6 @@
 class UserRolesController < ApplicationController
 class UserRolesController < ApplicationController

+  include UserMethods
+

   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web


@@ -7,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


@@ -41,7 +43,7 @@ class UserRolesController < ApplicationController
   ##
   # checks that the user doesn't already have this role
   def not_in_role
   ##
   # 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
       flash[:error] = t("user_role.filter.already_has_role", :role => @role)
       redirect_to user_path(@user)
     end


@@ -50,7 +52,7 @@ class UserRolesController < ApplicationController
   ##
   # checks that the user already has this role
   def in_role
   ##
   # 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
       flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)
       redirect_to user_path(@user)
     end