rails · Aug 6, 2010 · Aug 6, 2010 · Aug 11, 2010 · Aug 11, 2010 · Aug 12, 2010
Showing with 13 additions and 6 deletions.

+9 −5 actionpack/lib/action_dispatch/routing/polymorphic_routes.rb

+4 −1 railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -99,11 +99,15 @@ def polymorphic_url(record_or_hash_or_array, options = {})
         record = extract_record(record_or_hash_or_array)
         record = record.to_model if record.respond_to?(:to_model)
 
-        args = case record_or_hash_or_array
-          when Hash;  [ record_or_hash_or_array ]
-          when Array; record_or_hash_or_array.dup
-          else        [ record_or_hash_or_array ]
-        end
+        args = if record_or_hash_or_array.respond_to?(:polymorphic_url_args)
+		 record_or_hash_or_array.polymorphic_url_args
+	       else
+		 case record_or_hash_or_array
+		 when Hash;  [ record_or_hash_or_array ]
+		 when Array; record_or_hash_or_array.dup
+		 else        [ record_or_hash_or_array ]
+		 end
+	       end
 
         inflection = if options[:action] && options[:action].to_s == "new"
           args.pop

diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
@@ -7,6 +7,8 @@ class ScaffoldGenerator < Base
       include Rails::Generators::ResourceHelpers
 
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      class_option :add_views, :type => :array, :default => [], :banner => "index _form etc", :desc => "add custom views/templates"
+      class_option :skip_views, :type => :array, :default => [], :banner => "index _form etc", :desc => "skip views/templates"
 
       def create_root_folder
         empty_directory File.join("app/views", controller_file_path)
@@ -22,8 +24,9 @@ def copy_view_files
     protected
 
       def available_views
-        %w(index edit show new _form)
+        ( %w(index edit show new _form) | options[:add_views] ) - options[:skip_views]
       end
+
     end
   end
 end