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 37d4da00e009cdeeabdfa1a763264ca158329561..912453be8772891d4dcd3eed0e3b4685295cf509 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -1,41 +1,34 @@
 class UserRolesController < ApplicationController
 class UserRolesController < ApplicationController

+  include UserMethods
+

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

-  before_action :require_user
-  before_action :lookup_this_user
-  before_action :require_administrator
+
+  authorize_resource
+
+  before_action :lookup_user

   before_action :require_valid_role
   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
-    @this_user.roles.create(:role => @role, :granter => current_user)
-    redirect_to user_path(@this_user)
+  def create
+    @user.roles.create(:role => @role, :granter => current_user)
+    redirect_to user_path(@user)

   end
 
   end
 

-  def revoke
+  def destroy

     # checks that administrator role is not revoked from current user
     # checks that administrator role is not revoked from current user

-    if current_user == @this_user && @role == "administrator"
+    if current_user == @user && @role == "administrator"

       flash[:error] = t("user_role.filter.not_revoke_admin_current_user")
     else
       flash[:error] = t("user_role.filter.not_revoke_admin_current_user")
     else

-      UserRole.where(:user_id => @this_user.id, :role => @role).delete_all
+      UserRole.where(:user => @user, :role => @role).delete_all

     end
     end

-    redirect_to user_path(@this_user)
+    redirect_to user_path(@user)

   end
 
   private
 
   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(@this_user)
-    end
-  end
-

   ##
   # require that the given role is valid. the role is a URL
   # parameter, so should always be present.
   ##
   # require that the given role is valid. the role is a URL
   # parameter, so should always be present.


@@ -43,25 +36,25 @@ class UserRolesController < ApplicationController
     @role = params[:role]
     unless UserRole::ALL_ROLES.include?(@role)
       flash[:error] = t("user_role.filter.not_a_role", :role => @role)
     @role = params[:role]
     unless UserRole::ALL_ROLES.include?(@role)
       flash[:error] = t("user_role.filter.not_a_role", :role => @role)

-      redirect_to user_path(@this_user)
+      redirect_to user_path(@user)

     end
   end
 
   ##
   # checks that the user doesn't already have this role
   def not_in_role
     end
   end
 
   ##
   # checks that the user doesn't already have this role
   def not_in_role

-    if @this_user.has_role? @role
+    if @user.role? @role

       flash[:error] = t("user_role.filter.already_has_role", :role => @role)
       flash[:error] = t("user_role.filter.already_has_role", :role => @role)

-      redirect_to user_path(@this_user)
+      redirect_to user_path(@user)

     end
   end
 
   ##
   # checks that the user already has this role
   def in_role
     end
   end
 
   ##
   # checks that the user already has this role
   def in_role

-    unless @this_user.has_role? @role
+    unless @user.role? @role

       flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)
       flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)

-      redirect_to user_path(@this_user)
+      redirect_to user_path(@user)

     end
   end
 end
     end
   end
 end