aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-01-13 20:21:04 -0600
committerJoshua Peek <josh@joshpeek.com>2010-01-13 20:26:01 -0600
commitbe968ecd8b93f128a01427f76c888c291cbc239b (patch)
tree764143daabc9310ef8d81ab1c0fd64280ea3e0b4 /actionpack/lib/action_controller/metal
parent0f51e45307508d72f65b733dbbbd1c62f27a8bef (diff)
downloadrails-be968ecd8b93f128a01427f76c888c291cbc239b.tar.gz
rails-be968ecd8b93f128a01427f76c888c291cbc239b.tar.bz2
rails-be968ecd8b93f128a01427f76c888c291cbc239b.zip
Respect resources_path_names and :path_names options in new dsl
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 3d50e79a23..7180c0ceda 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -21,6 +21,8 @@ module ActionController
class << self
delegate :default_charset=, :to => "ActionDispatch::Response"
+ delegate :resources_path_names, :to => "ActionController::Routing::Routes"
+ delegate :resources_path_names=, :to => "ActionController::Routing::Routes"
end
# cattr_reader :protected_instance_variables
@@ -31,9 +33,6 @@ module ActionController
@before_filter_chain_aborted @_headers @_params
@_flash @_response)
- cattr_accessor :resources_path_names
- self.resources_path_names = { :new => 'new', :edit => 'edit' }
-
# Controls the resource action separator
cattr_accessor :resource_action_separator
self.resource_action_separator = "/"