will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pluralize error on index action when passing resource name - closes #143 again

Browse Source
This commit is contained in:
Ryan Bates 2010-09-07 22:10:16 -07:00
parent 9d915457af
commit a5ff826e40
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cancan/controller_resource.rb
View File

@ -29,7 +29,7 @@ module CanCan
if !resource_instance && (parent? || member_action?)
@controller.instance_variable_set("@#{instance_name}", load_resource_instance)
elsif load_collection?
@controller.instance_variable_set("@#{instance_name.pluralize}", load_collection)
@controller.instance_variable_set("@#{instance_name.to_s.pluralize}", load_collection)
end
end

2
spec/cancan/controller_resource_spec.rb
View File

@ -67,7 +67,7 @@ describe CanCan::ControllerResource do
it "should build a collection when on index action when class responds to accessible_by" do
stub(Project).accessible_by(@ability) { :found_projects }
@params[:action] = "index"
resource = CanCan::ControllerResource.new(@controller)
resource = CanCan::ControllerResource.new(@controller, :project)
resource.load_resource
@controller.instance_variable_get(:@project).should be_nil
@controller.instance_variable_get(:@projects).should == :found_projects