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
##
- # 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]