Skip to content
Snippets Groups Projects
Commit d5baed62 authored by Mark Sim's avatar Mark Sim Committed by Anuj Dutta
Browse files

Fixes Nested Resource Loading

parent 7bf683d8
No related branches found
No related tags found
No related merge requests found
......@@ -215,8 +215,12 @@ module CanCan
end
end
def namespace
@params[:controller].split("::")[0..-2]
end
def namespaced_name
@name || @params[:controller].sub("Controller", "").singularize.camelize.constantize
[namespace, name.camelize].join('::').singularize.camelize.constantize
rescue NameError
name
end
......
......@@ -215,6 +215,14 @@ describe CanCan::ControllerResource do
resource.should_not be_parent
end
it "should have the specified resource_class if 'name' is passed to load_resource" do
class Section
end
resource = CanCan::ControllerResource.new(@controller, :section)
resource.send(:resource_class).should == Section
end
it "should load parent resource through proper id parameter" do
project = Project.create!
@params.merge!(:controller => "categories", :action => "index", :project_id => project.id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment