Changeset 9064

Timestamp:

03/20/08 02:15:29 (2 months ago)

Author:

david

Message:

Docfixes (closes #11356, #11172, #10523)

Files:

• trunk/actionpack/lib/action_view/helpers/form_options_helper.rb (modified) (1 diff)
• trunk/actionpack/test/template/form_options_helper_test.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/associations.rb (modified) (2 diffs)
• trunk/railties/README (modified) (1 diff)

trunk/actionpack/lib/action_view/helpers/form_options_helper.rb

@@ -53 +53 @@
-    #     <option value="2">Sam</option>
-    #     <option value="3">Tobias</option>
+    #   </select>
+    # 
+    # Like the other form helpers, +select+ can accept an <tt>:index</tt> option to manually set the ID used in the resulting output. Unlike other helpers, +select+ expects this 
+    # option to be in the +html_options+ parameter.
+    # 
+    # Example: 
+    # 
+    #   select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
+    # 
+    # becomes:
+    # 
+    #   <select name="album[][genre]" id="album__genre">
+    #     <option value="rap">rap</option>
+    #     <option value="rock">rock</option>
+    #     <option value="country">country</option>
-    #   </select>
-    module FormOptionsHelper

trunk/actionpack/test/template/form_options_helper_test.rb

@@ -32 +32 @@
-    Country   = Struct.new('Country', :country_id, :country_name)
-    Firm      = Struct.new('Firm', :time_zone)
+    Album     = Struct.new('Album', :id, :title, :genre)
-  end
-
@@ -304 +305 @@
-      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" selected=\"selected\">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 ), :selected => 'abe')
+    )
+  end
+  
+  def test_select_with_index_option
+    @album = Album.new
+    @album.id = 1
+    
+    expected = "<select id=\"album__genre\" name=\"album[][genre]\"><option value=\"rap\">rap</option>\n<option value=\"rock\">rock</option>\n<option value=\"country\">country</option></select>"    
+
+    assert_dom_equal(
+      expected, 
+      select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
-    )
-  end

trunk/activerecord/lib/active_record/associations.rb

@@ -810 +810 @@
-      #   is used on the associate class (such as a +Post+ class). You can also specify a custom counter cache column by providing
-      #   a column name instead of a +true+/+false+ value to this option (e.g., <tt>:counter_cache => :my_custom_counter</tt>.)
+      #   When creating a counter cache column, the database statement or migration must specify a default value of <tt>0</tt>, failing to do 
+      #   this results in a counter with NULL value, which will never increment.
-      #   Note: Specifying a counter_cache will add it to that model's list of readonly attributes using #attr_readonly.
-      # * <tt>:include</tt>  - specify second-order associations that should be eager loaded when this object is loaded.
@@ -825 +827 @@
-      #   belongs_to :attachable, :polymorphic => true
-      #   belongs_to :project, :readonly => true
+      #   belongs_to :post, :counter_cache => true
-      def belongs_to(association_id, options = {})
-        reflection = create_belongs_to_reflection(association_id, options)

trunk/railties/README

@@ -32 +32 @@
-   (If you've downloaded Rails in a complete tgz or zip, this step is already done)
-2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options)
-’
+'
-4. Follow the guidelines to start developing your application
-