Show correct paths to generated templates for nexted controllers. Fixes #730

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1828 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 10 insertions, 9 deletions

diff --git a/railties/lib/rails_generator/generators/components/controller/controller_generator.rb b/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
index 32bc5c5842..358d357432 100644
--- a/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
+++ b/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
@@ -28,9 +28,10 @@ class ControllerGenerator < Rails::Generator::NamedBase
 
       # View template for each action.
       actions.each do |action|
+        path = File.join('app/views', class_path, file_name, "#{action}.rhtml")
         m.template 'view.rhtml',
-          File.join('app/views', class_path, file_name, "#{action}.rhtml"),
-          :assigns => { :action => action }
+          path,
+          :assigns => { :action => action, :path => path }
       end
     end
   end
diff --git a/railties/lib/rails_generator/generators/components/controller/templates/view.rhtml b/railties/lib/rails_generator/generators/components/controller/templates/view.rhtml
index 7e7a7d53ce..ad85431f98 100644
--- a/railties/lib/rails_generator/generators/components/controller/templates/view.rhtml
+++ b/railties/lib/rails_generator/generators/components/controller/templates/view.rhtml
@@ -1,2 +1,2 @@
 <h1><%= class_name %>#<%= action %></h1>
-<p>Find me in app/views/<%= file_name %>/<%= action %>.rhtml</p>
+<p>Find me in <%= path %></p>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
index 6307a73e43..5c744e8af9 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -115,12 +115,12 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
 
       # Unscaffolded views.
       unscaffolded_actions.each do |action|
-        m.template "controller:view.rhtml",
-                   File.join('app/views',
-                             controller_class_path,
-                             controller_file_name,
-                             "#{action}.rhtml"),
-                   :assigns => { :action => action }
+        path = File.join('app/views',
+                          controller_class_path,
+                          controller_file_name,
+                          "#{action}.rhtml")
+        m.template "controller:view.rhtml", path,
+                   :assigns => { :action => action, :path => path}
       end
     end
   end