Ticket #2991: select_not_selected_option.diff

actionpack/test/template/form_options_helper_test.rb

@@ -283 +283 @@
-      select("post", "category", %w( abe <mus> hest), :prompt => true, :include_blank => true)
-    )
-  end
+  
+  def test_select_with_not_selected
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :not_selected => true)
+    )
+  end
-
-  def test_collection_select
-    @posts = [

actionpack/lib/action_view/helpers/form_options_helper.rb

@@ -47 +47 @@
-      #
-      # could become:
-      #
-
+]
-      #     <option></option>
-      #     <option value="1" selected="selected">David</option>
-      #     <option value="2">Sam</option>
@@ -59 +59 @@
-      # to the database. Instead, a second model object is created when the create request is received.
-      # This allows the user to submit a form page more than once with the expected results of creating multiple records.
-      # In addition, this allows a single partial to be used to generate form inputs for both edit and create forms.
+      #
+      # The option :not_selected => true can be used if the current model value should not be selected by default.
-      def select(object, method, choices, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, nil, options.delete(:object)).to_select_tag(choices, options, html_options)
-      end
@@ -296 +298 @@
-      def to_select_tag(choices, options, html_options)
-        html_options = html_options.stringify_keys
-        add_default_name_and_id(html_options)
-
+options[:not_selected] ? nil : 
-      end
-
-      def to_collection_select_tag(collection, value_method, text_method, options, html_options)

actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+* Add :not_selected option to select() to not select current model value. [Jonathan Viney <jonathan@bluewire.net.nz>]
+
-* Initialize @optional in routing code to avoid warnings about uninitialized access to an instance variable. [Nicholas Seckar]
-
-* Make ActionController's render honor the :locals option when rendering a :file. #1665. [Emanuel Borsboom, Marcel Molina Jr.]