aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-01-16 15:16:22 -0600
committerJoshua Peek <josh@joshpeek.com>2010-01-16 15:16:22 -0600
commite9a1dbe79a6610793a71af227aaf64ff55554cad (patch)
tree16f6c5fad6dbdea2807d1cd098b75ed1567747a9 /actionpack/lib/action_dispatch/routing/mapper.rb
parent468cfcedd311a428339fa01e5f62b935f2995ec0 (diff)
downloadrails-e9a1dbe79a6610793a71af227aaf64ff55554cad.tar.gz
rails-e9a1dbe79a6610793a71af227aaf64ff55554cad.tar.bz2
rails-e9a1dbe79a6610793a71af227aaf64ff55554cad.zip
Allow custom controller for resource(s) [#3703 state:resolved]
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ce5c56ae1c..9aaa4355f2 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -380,7 +380,7 @@ module ActionDispatch
end
def controller
- plural
+ options[:controller] || plural
end
def member_name