Skip to content
Commits on Jun 18, 2012
  1. @mikepack @andhapp
  2. @mikepack @andhapp

    Add specs for resource attributes.

    mikepack committed with andhapp Jun 4, 2012
    Remove inconsistent line breaks.
  3. @mccraigmccraig @andhapp
Commits on Mar 16, 2011
  1. @amw

    Fixes inherited_resources collection authorization

    amw committed Mar 16, 2011
    This reverts e3eab13
    
    I don't know what was the idea of that, but it turned out REAL bad.
    
    `collection` sets the collection instance variable. `resource_base` is used all
    over CanCan. It's also used inside `load_collection?` which is checked before
    `load_collection` is called. That means we actually set the collection instance
    variable through inherited_resources (without any authorization whatsoever) before trying to load it through CanCan using `accessible_by`.
    
        1. def load_resource
        2.  unless skip?(:load)
        3.    if load_instance?
        4.      self.resource_instance ||= load_resource_instance
        5.    elsif load_collection?
        6.      self.collection_instance ||= load_collection
        7.    end
        8.  end
        9. end
    
    `collection_instance` is set on line 5 instead of line 6.
Commits on Mar 8, 2011
  1. Merge branch 'master' of https://github.com/stefanoverna/cancan into …

    committed Mar 8, 2011
    …stefanoverna-master
  2. @tanordheim

    Use collection instead of end_of_association_chain in the inherited_r…

    tanordheim committed Mar 8, 2011
    …esources integration, as per suggested by aq1018
Commits on Feb 17, 2011
  1. @stefanoverna
Commits on Sep 16, 2010
  1. @jbarreneche

    Controllers which use 'inherit_resources' instead of Inheritance may …

    jbarreneche committed with Sep 15, 2010
    …have inherited_resource's methods protected
Commits on Sep 9, 2010
Something went wrong with that request. Please try again.