diff options
| author | Michael S. Klishin <michael@novemberain.com> | 2008-12-28 23:47:29 +0300 |
|---|---|---|
| committer | Michael S. Klishin <michael@novemberain.com> | 2008-12-28 23:47:29 +0300 |
| commit | 2b8750eba439c4b829b2e8172a1edc0dfa9c532b (patch) | |
| tree | 1ea12e7fe5ad299119d801c7e7f527f6b7780bc3 /actionpack/lib/action_controller/polymorphic_routes.rb | |
| parent | e523b43e202d343912f67b8c8737d9e2e956b31f (diff) | |
| parent | 0efec64520d5153e5a961f9a759883656b83bb53 (diff) | |
| download | rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.tar.gz rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.tar.bz2 rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.zip | |
Sync with rails/rails/master, merge two metaprogramming annotation efforts
Diffstat (limited to 'actionpack/lib/action_controller/polymorphic_routes.rb')
| -rw-r--r-- | actionpack/lib/action_controller/polymorphic_routes.rb | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/polymorphic_routes.rb b/actionpack/lib/action_controller/polymorphic_routes.rb index dce50c6c3b..924d1aa6bd 100644 --- a/actionpack/lib/action_controller/polymorphic_routes.rb +++ b/actionpack/lib/action_controller/polymorphic_routes.rb @@ -118,13 +118,17 @@ module ActionController %w(edit new).each do |action| module_eval <<-EOT, __FILE__, __LINE__ - def #{action}_polymorphic_url(record_or_hash, options = {}) - polymorphic_url(record_or_hash, options.merge(:action => "#{action}")) - end - - def #{action}_polymorphic_path(record_or_hash, options = {}) - polymorphic_url(record_or_hash, options.merge(:action => "#{action}", :routing_type => :path)) - end + def #{action}_polymorphic_url(record_or_hash, options = {}) # def edit_polymorphic_url(record_or_hash, options = {}) + polymorphic_url( # polymorphic_url( + record_or_hash, # record_or_hash, + options.merge(:action => "#{action}")) # options.merge(:action => "edit")) + end # end + # + def #{action}_polymorphic_path(record_or_hash, options = {}) # def edit_polymorphic_path(record_or_hash, options = {}) + polymorphic_url( # polymorphic_url( + record_or_hash, # record_or_hash, + options.merge(:action => "#{action}", :routing_type => :path)) # options.merge(:action => "edit", :routing_type => :path)) + end # end EOT end |