Use lazy lookups for translations in issues

[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 1cfbaf977b0d5a487f2bba28bd198dc2cfa88c9b..37d4da00e009cdeeabdfa1a763264ca158329561 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -10,13 +10,18 @@ class UserRolesController < ApplicationController
   before_action :in_role, :only => [:revoke]
 
   def grant
   before_action :in_role, :only => [:revoke]
 
   def grant

-    @this_user.roles.create(:role => @role, :granter_id => @user.id)
-    redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+    @this_user.roles.create(:role => @role, :granter => current_user)
+    redirect_to user_path(@this_user)

   end
 
   def revoke
   end
 
   def revoke

-    UserRole.delete_all(:user_id => @this_user.id, :role => @role)
-    redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+    # checks that administrator role is not revoked from current user
+    if current_user == @this_user && @role == "administrator"
+      flash[:error] = t("user_role.filter.not_revoke_admin_current_user")
+    else
+      UserRole.where(:user_id => @this_user.id, :role => @role).delete_all
+    end
+    redirect_to user_path(@this_user)

   end
 
   private
   end
 
   private


@@ -25,9 +30,9 @@ class UserRolesController < ApplicationController
   # require that the user is an administrator, or fill out a helpful error message
   # and return them to theuser page.
   def require_administrator
   # require that the user is an administrator, or fill out a helpful error message
   # and return them to theuser page.
   def require_administrator

-    unless @user.administrator?
+    unless current_user.administrator?

       flash[:error] = t "user_role.filter.not_an_administrator"
       flash[:error] = t "user_role.filter.not_an_administrator"

-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@this_user)

     end
   end
 
     end
   end
 


@@ -38,7 +43,7 @@ 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 :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@this_user)

     end
   end
 
     end
   end
 


@@ -47,7 +52,7 @@ class UserRolesController < ApplicationController
   def not_in_role
     if @this_user.has_role? @role
       flash[:error] = t("user_role.filter.already_has_role", :role => @role)
   def not_in_role
     if @this_user.has_role? @role
       flash[:error] = t("user_role.filter.already_has_role", :role => @role)

-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@this_user)

     end
   end
 
     end
   end
 


@@ -56,7 +61,7 @@ class UserRolesController < ApplicationController
   def in_role
     unless @this_user.has_role? @role
       flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)
   def in_role
     unless @this_user.has_role? @role
       flash[:error] = t("user_role.filter.doesnt_have_role", :role => @role)

-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@this_user)

     end
   end
 end
     end
   end
 end