diff options
author | Michael Koziarski <michael@koziarski.com> | 2008-04-12 12:40:40 +1200 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-04-12 12:40:40 +1200 |
commit | 063c393bf0a2eb762770c97f925b7c2867361ad4 (patch) | |
tree | 81eda9f330faa3cebbe1a77b19a68476cfc77eac | |
parent | 4364c361b599f99bc2345ce4eb2d145b07ed8a0f (diff) | |
download | rails-063c393bf0a2eb762770c97f925b7c2867361ad4.tar.gz rails-063c393bf0a2eb762770c97f925b7c2867361ad4.tar.bz2 rails-063c393bf0a2eb762770c97f925b7c2867361ad4.zip |
Allow alternative values for the 'new' and 'edit' actions in resourceful routes.
map.resource :schools, :as => 'escuelas', :path_names => { :new => 'nueva' }
Closes #11181. [ivanvr]
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_controller/resources.rb | 21 | ||||
-rw-r--r-- | actionpack/test/controller/resources_test.rb | 6 |
3 files changed, 28 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 7c838ba769..63ad4d042a 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -337,6 +337,10 @@ module ActionController #:nodoc: @@resource_action_separator = "/" cattr_accessor :resource_action_separator + # Allow to override path names for default resources' actions + @@resources_path_names = { :new => 'new', :edit => 'edit' } + cattr_accessor :resources_path_names + # Sets the token parameter name for RequestForgery. Calling #protect_from_forgery sets it to :authenticity_token by default cattr_accessor :request_forgery_protection_token diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb index 2cc01f61dc..df7d6ead1b 100644 --- a/actionpack/lib/action_controller/resources.rb +++ b/actionpack/lib/action_controller/resources.rb @@ -80,7 +80,9 @@ module ActionController end def new_path - @new_path ||= "#{path}/new" + new_action = self.options[:path_names][:new] if self.options[:path_names] + new_action ||= Base.resources_path_names[:new] + @new_path ||= "#{path}/#{new_action}" end def member_path @@ -266,6 +268,13 @@ module ActionController # notes.resources :attachments # end # + # * <tt>:path_names</tt> - specify different names for the 'new' and 'edit' actions. For example: + # # new_products_path == '/productos/nuevo' + # map.resources :products, :as => 'productos', :path_names => { :new => 'nuevo', :edit => 'editar' } + # + # You can also set default action names from an environment, like this: + # config.action_controller.resources_path_names = { :new => 'nuevo', :edit => 'editar' } + # # * <tt>:path_prefix</tt> - set a prefix to the routes with required route variables. # # Weblog comments usually belong to a post, so you might use resources like: @@ -515,8 +524,14 @@ module ActionController resource.member_methods.each do |method, actions| actions.each do |action| action_options = action_options_for(action, resource, method) - map.named_route("#{action}_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}#{resource.action_separator}#{action}", action_options) - map.named_route("formatted_#{action}_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}#{resource.action_separator}#{action}.:format",action_options) + action_path = action + if resource.options[:path_names] + action_path = resource.options[:path_names][action] + action_path ||= Base.resources_path_names[action] + end + + map.named_route("#{action}_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}#{resource.action_separator}#{action_path}", action_options) + map.named_route("formatted_#{action}_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}#{resource.action_separator}#{action_path}.:format",action_options) end end diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb index c62a2043d9..0f1ac30f04 100644 --- a/actionpack/test/controller/resources_test.rb +++ b/actionpack/test/controller/resources_test.rb @@ -76,6 +76,12 @@ class ResourcesTest < Test::Unit::TestCase end end + def test_override_paths_for_default_restful_actions + resource = ActionController::Resources::Resource.new(:messages, + :path_names => {:new => 'nuevo', :edit => 'editar'}) + assert_equal resource.new_path, "#{resource.path}/nuevo" + end + def test_multiple_default_restful_routes with_restful_routing :messages, :comments do assert_simply_restful_for :messages |