X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5f33656c8d6725969ac63dbfe038633ad0e4352f..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/controllers/user_roles_controller.rb

diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb
index cb0425f32..4316c5e94 100644
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -10,35 +10,29 @@ class UserRolesController < ApplicationController
   before_filter :in_role, :only => [:revoke]
 
   def grant
-    @this_user.roles.create({
-      :role => @role, :granter_id => @user.id
-    }, :without_protection => true)
+    @this_user.roles.create(:role => @role, :granter_id => @user.id)
     redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
   end
 
   def revoke
-    UserRole.delete_all({:user_id => @this_user.id, :role => @role})
+    UserRole.delete_all(:user_id => @this_user.id, :role => @role)
     redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
   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'
+      flash[:error] = t 'user_role.filter.not_an_administrator'
       redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
     end
   end
 
   ##
-  # ensure that there is a "this_user" instance variable
-  def lookup_this_user
-    @this_user = User.find_by_display_name(params[:display_name])
-  rescue ActiveRecord::RecordNotFound
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
-  end
-
-  ##
-  # require that the given role is valid. the role is a URL 
+  # require that the given role is valid. the role is a URL
   # parameter, so should always be present.
   def require_valid_role
     @role = params[:role]