Use configured protocol for URLs in diary feeds

[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 536790dc5b36f9e924b971d3cd9c66ed46248558..5ef68216bf81e8cc26a53845bf138110edbc1a10 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -15,7 +15,12 @@ class UserRolesController < ApplicationController
   end
 
   def revoke
   end
 
   def revoke

-    UserRole.where(:user_id => @this_user.id, :role => @role).delete_all
+    # 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 :controller => "user", :action => "view", :display_name => @this_user.display_name
   end
 
     redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
   end