Merge remote-tracking branch 'upstream/pull/2042'

[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 8b1c2e8c0b738f820a27bb227b30917d3dbcb59c..732a2bb2c24a48c19e49324c75e3a5eea12050e0 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -1,22 +1,27 @@
 class UserRolesController < ApplicationController
   layout "site"
 
 class UserRolesController < ApplicationController
   layout "site"
 

-  before_filter :authorize_web
-  before_filter :require_user
-  before_filter :lookup_this_user
-  before_filter :require_administrator
-  before_filter :require_valid_role
-  before_filter :not_in_role, :only => [:grant]
-  before_filter :in_role, :only => [:revoke]
+  before_action :authorize_web
+  before_action :require_user
+  before_action :lookup_user
+  before_action :require_administrator
+  before_action :require_valid_role
+  before_action :not_in_role, :only => [:grant]
+  before_action :in_role, :only => [:revoke]

 
   def grant
 
   def grant

-    @this_user.roles.create(:role => @role, :granter_id => @user.id)
-    redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+    @user.roles.create(:role => @role, :granter => current_user)
+    redirect_to user_path(@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 == @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
+    end
+    redirect_to user_path(@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(@user)

     end
   end
 
     end
   end
 


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

     end
   end
 end
     end
   end
 end