aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-19 17:10:04 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-19 17:10:04 +0000
commit9be37c9b203994724a1d7e60a99b207442f3fec5 (patch)
tree6953b12a468257e21a4a955c678f86de26e08356 /actionpack
parent70f891a789223d60ae4257b7f99794886cd3d63d (diff)
downloadrails-9be37c9b203994724a1d7e60a99b207442f3fec5.tar.gz
rails-9be37c9b203994724a1d7e60a99b207442f3fec5.tar.bz2
rails-9be37c9b203994724a1d7e60a99b207442f3fec5.zip
Fixed scaffolding and routes conflict #669
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@693 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/scaffolding.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/scaffolding.rb b/actionpack/lib/action_controller/scaffolding.rb
index 52fc570a04..db988e0216 100644
--- a/actionpack/lib/action_controller/scaffolding.rb
+++ b/actionpack/lib/action_controller/scaffolding.rb
@@ -141,7 +141,7 @@ module ActionController
if @#{singular_name}.save
flash["notice"] = "#{class_name} was successfully updated"
- redirect_to :action => "show#{suffix}/" + @#{singular_name}.id.to_s
+ redirect_to :action => "show#{suffix}" + @#{singular_name}.id.to_s
else
render#{suffix}_scaffold('edit')
end