Changeset 1169

Timestamp:

01/05/08 08:57:20 (8 months ago)

Author:

rogelio.samo..@gmail.com

Message:

- Allows checkbox_field to have values other than 1/0 when "checked"
- All specs pass and completely backwards compatible. Closes #402 [gtdev@spearhead.de]

Files:

• plugins/merb_helpers/lib/merb_helpers/form_helpers.rb (modified) (1 diff)
• plugins/merb_helpers/spec/merb_helpers_spec.rb (modified) (1 diff)

plugins/merb_helpers/lib/merb_helpers/form_helpers.rb

@@ -224 +224 @@
-
-      # Provides a generic HTML checkbox input tag.
+      # There are two ways this tag can be generated, based on the
+      # option :boolean. If not set to true, a "magic" input is generated.
+      # Otherwise, an input is created that can be easily used for passing
+      # an array of values to the application.
-      #
-      # ==== Example
-      #     <% checkbox_field :name => "is_activated", :value => "1" %>
+      #
+      #     <% checkbox_field :name => "choices[]", :boolean => false, :value => "dog" %>
+      #     <% checkbox_field :name => "choices[]", :boolean => false, :value => "cat" %>
+      #     <% checkbox_field :name => "choices[]", :boolean => false, :value => "weasle" %>
-      def checkbox_field(attrs = {}, hidden_attrs={})
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        attrs.merge!(:type => :checkbox)
-        attrs.add_html_class!("checkbox")
-hidden_field({:name => attrs[:name], :value => off}.merge(hidden_attrs)
-
-
+(boolbox ? hidden_field({:name => attrs[:name], :value => off}.merge(hidden_attrs)) : ''
+
+
-      # Returns a hidden input tag tailored for accessing a specified attribute (identified by +col+) on an object
-      # resource within a +form_for+ resource block. Additional options on the input tag can be passed as a

plugins/merb_helpers/spec/merb_helpers_spec.rb

@@ -283 +283 @@
-    checkbox_field(:name => "foo", :checked => "checked").should match_tag(:input, :class => "checkbox", :name => "foo", :checked => "checked")
-  end
+
+  it "should return a basic checkbox with :boolean => true" do
+    checkbox_field(:name => "foo", :checked => "checked", :boolean => true).should match_tag(:input, :class => "checkbox", :name => "foo", :checked => "checked")
+  end
+
+  it "should return a basic checkbox with a value other than 1/0" do
+    checkbox_field(:name => "choices[]", :boolean => false, :value => "dog").should match_tag(:input, :class => "checkbox", :name => "choices[]", :value => "dog")
+  end
-  
-  it "should provide an additional label tag if the :label option is passed in" do