Resolve conflict

[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 f38ba82ac80e59b1c1c354eb7c728e91552df88e..8f623a04dff3257d4ba199a1fdc6adb0f73568e7 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -10,9 +10,7 @@ class UserRolesController < ApplicationController
   before_filter :in_role, :only => [:revoke]
 
   def grant
   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
 
     redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name
   end
 


@@ -32,14 +30,6 @@ class UserRolesController < ApplicationController
     end
   end
 
     end
   end
 

-  ##
-  # ensure that there is a "this_user" instance variable
-  def lookup_this_user
-    unless @this_user = User.find_by_display_name(params[:display_name])
-      render_unknown_user params[:display_name]
-    end
-  end
-

   ##
   # require that the given role is valid. the role is a URL 
   # parameter, so should always be present.
   ##
   # require that the given role is valid. the role is a URL 
   # parameter, so should always be present.