Added scaffold views to scaffold controller.

2 files changed, 10 insertions, 2 deletions

diff --git a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 181d21ba35..7fbbf90105 100644
--- a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -5,14 +5,19 @@ module Rails
 
       check_class_collision :suffix => "Controller"
       class_option :orm, :desc => "ORM to generate the controller for", :banner => "NAME", :type => :string
-      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
+      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller" # TODO Spec me
 
       def create_controller_files
         template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb")
       end
 
       hook_for :template_engine, :test_framework, :as => :scaffold
-      invoke_if :helper
+
+      # Invoke the helper using the controller (pluralized) name.
+      #
+      invoke_if :helper do |base, invoked|
+        base.invoke invoked, [ base.controller_name ]
+      end
 
       protected
 
@@ -23,6 +28,7 @@ module Rails
         def orm_instance
           @orm_instance ||= @orm_class.new(file_name)
         end
+
     end
   end
 end
diff --git a/railties/lib/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/generators/rails/scaffold_controller/templates/controller.rb
index 307638acf8..3cc8bbf8e7 100644
--- a/railties/lib/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/generators/rails/scaffold_controller/templates/controller.rb
@@ -1,4 +1,5 @@
 class <%= controller_class_name %>Controller < ApplicationController
+<% unless options[:singleton] -%>
   # GET /<%= table_name %>
   # GET /<%= table_name %>.xml
   def index
@@ -9,6 +10,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       format.xml  { render :xml => @<%= table_name %> }
     end
   end
+<% end -%>
 
   # GET /<%= table_name %>/1
   # GET /<%= table_name %>/1.xml