diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-26 01:56:52 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-26 01:56:52 +0100 |
| commit | abad097016bf5243e9812f6a031f421a986b09f7 (patch) | |
| tree | f526a520a87db9c68ddd3436ce4bdb6f8c3182d1 /railties/lib/generators/rails/resource/resource_generator.rb | |
| parent | 8974dac92e05dcab8ee552a5f40108c6ac25dc36 (diff) | |
| parent | c02391f8f97182e818d22a0f0ec4a5589d2fff15 (diff) | |
| download | rails-abad097016bf5243e9812f6a031f421a986b09f7.tar.gz rails-abad097016bf5243e9812f6a031f421a986b09f7.tar.bz2 rails-abad097016bf5243e9812f6a031f421a986b09f7.zip | |
Merge remote branch 'mikel/master'
Diffstat (limited to 'railties/lib/generators/rails/resource/resource_generator.rb')
| -rw-r--r-- | railties/lib/generators/rails/resource/resource_generator.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/resource/resource_generator.rb b/railties/lib/generators/rails/resource/resource_generator.rb index 43c7cc85f4..5acb839f39 100644 --- a/railties/lib/generators/rails/resource/resource_generator.rb +++ b/railties/lib/generators/rails/resource/resource_generator.rb @@ -6,8 +6,8 @@ module Rails class ResourceGenerator < ModelGenerator #metagenerator include ResourceHelpers - hook_for :resource_controller, :required => true do |base, controller| - base.invoke controller, [ base.controller_name, base.options[:actions] ] + hook_for :resource_controller, :required => true do |controller| + invoke controller, [ controller_name, options[:actions] ] end class_option :actions, :type => :array, :banner => "ACTION ACTION", :default => [], |