Permalink
Browse files

Modifying to see if I can get the collection to load even when a bloc…

…k is given
  • Loading branch information...
hunterae committed Oct 18, 2010
1 parent 3cee524 commit 54ed52d2c14c08db71c8976387c347fafbc95d45
Showing with 2 additions and 3 deletions.
  1. +2 −3 lib/cancan/controller_resource.rb
@@ -52,9 +52,8 @@ def load_resource_instance
end
def load_collection?
- resource_base.respond_to?(:accessible_by)
- # &&
- # !current_ability.has_block?(authorization_action, resource_class)
+ resource_base.respond_to?(:accessible_by) &&
+ !current_ability.has_block?(authorization_action, resource_class)
end
def load_collection

0 comments on commit 54ed52d

Please sign in to comment.