Remove column sorting

[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..536790dc5b36f9e924b971d3cd9c66ed46248558 100644 (file)
--- a/app/controllers/user_roles_controller.rb
+++ b/app/controllers/user_roles_controller.rb
@@ -1,21 +1,21 @@
 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_this_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)
+    @this_user.roles.create(:role => @role, :granter => current_user)

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

     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
 


@@ -25,7 +25,7 @@ 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"
       redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
     end
       flash[:error] = t "user_role.filter.not_an_administrator"
       redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
     end