X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbd88d893f3c3fce9cafd666b94396988646d81f..be0e33862fedbf02e52a9e126cac31dfb5775b43:/app/controllers/user_roles_controller.rb

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index 9c0339c7a..fe4c855e3 100644
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -2,35 +2,31 @@ class UserRolesController < ApplicationController
   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 :not_in_role, :only => [: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
+    @user.roles.create(:role => @role, :granter => current_user)
+    redirect_to user_path(@user)
   end
 
   def revoke
-    UserRole.where(:user_id => @this_user.id, :role => @role).delete_all
-    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
 
-  ##
-  # 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?
-      flash[:error] = t "user_role.filter.not_an_administrator"
-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
-    end
-  end
-
   ##
   # require that the given role is valid. the role is a URL
   # parameter, so should always be present.
@@ -38,25 +34,25 @@ class UserRolesController < ApplicationController
     @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
-    if @this_user.has_role? @role
+    if @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(@user)
     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)
-      redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
+      redirect_to user_path(@user)
     end
   end
 end