diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-03-13 17:13:18 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-03-13 17:13:18 -0500 |
| commit | 5b025a1d119eaf09f5376209da212b76725747f8 (patch) | |
| tree | dc9913682ebea799d7ce69231cebbc221f590834 /actionpack/lib/action_controller | |
| parent | eced3d8c55c1bbae6915d7c6523c341bc682509a (diff) | |
| download | rails-5b025a1d119eaf09f5376209da212b76725747f8.tar.gz rails-5b025a1d119eaf09f5376209da212b76725747f8.tar.bz2 rails-5b025a1d119eaf09f5376209da212b76725747f8.zip | |
Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 state:wontfix]
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/resources.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb index 0a89c4b3d5..5f71a105c8 100644 --- a/actionpack/lib/action_controller/resources.rb +++ b/actionpack/lib/action_controller/resources.rb @@ -670,12 +670,7 @@ module ActionController when "show", "edit"; default_options.merge(add_conditions_for(resource.conditions, method || :get)).merge(resource.requirements(require_id)) when "update"; default_options.merge(add_conditions_for(resource.conditions, method || :put)).merge(resource.requirements(require_id)) when "destroy"; default_options.merge(add_conditions_for(resource.conditions, method || :delete)).merge(resource.requirements(require_id)) - else - if method.nil? || resource.member_methods.nil? || resource.member_methods[method.to_sym].nil? - default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements) - else - resource.member_methods[method.to_sym].include?(action) ? default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements(require_id)) : default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements) - end + else default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements) end end end |