aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-21 16:05:35 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-21 16:07:21 -0700
commit49416550fe6f0165423ff6c64161b0a3bd4d5ea7 (patch)
tree5391779894e6ad9eae3e673476d8538d0cdf0889 /railties/lib/generators
parentb7adec3563c18247db85ddae189c0b2fd65975a9 (diff)
downloadrails-49416550fe6f0165423ff6c64161b0a3bd4d5ea7.tar.gz
rails-49416550fe6f0165423ff6c64161b0a3bd4d5ea7.tar.bz2
rails-49416550fe6f0165423ff6c64161b0a3bd4d5ea7.zip
Fix regression introduced in 8b50f89. Generated views mentioned the wrong path.
Diffstat (limited to 'railties/lib/generators')
-rw-r--r--railties/lib/generators/erb/controller/controller_generator.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/generators/erb/controller/controller_generator.rb b/railties/lib/generators/erb/controller/controller_generator.rb
index a8bbcf401c..d78bcba1b8 100644
--- a/railties/lib/generators/erb/controller/controller_generator.rb
+++ b/railties/lib/generators/erb/controller/controller_generator.rb
@@ -10,8 +10,9 @@ module Erb
empty_directory base_path
actions.each do |action|
- @action, @path = action, File.join(base_path, action)
- template filename_with_extensions(:view), filename_with_extensions(@path)
+ @action = action
+ @path = filename_with_extensions(File.join(base_path, action))
+ template filename_with_extensions(:view), @path
end
end
end