Changeset 923

Timestamp:

11/09/07 22:18:29 (1 year ago)

Author:

jimfree..@gmail.com

Message:

Updated checkbox to take :on and :off attributes. Defaults to "1" and "0" respectively. Also adds a hidden field so the :off state will return a value from the browser.

Files:

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

plugins/merb_helpers/lib/form_helpers.rb

@@ -77 +77 @@
-      end
-      
+      def cb_val_to_bool(val)
+        !(val == false || val.nil?) && val.to_i != 0
+      end
+      private :cb_val_to_bool
+
-      def checkbox_control(col, attrs = {})
-        errorify_field(attrs, col)
-
-
-
+
-        checkbox_field(control_name_value(col, attrs))
-      end
-
+
-      def checkbox_field(attrs = {})
+        on            = attrs.delete(:on)  || 1
+        off           = attrs.delete(:off) || 0
+        attrs[:value] = on if (!attrs.has_key?(:value) || attrs[:value].nil?)
-        attrs.merge!(:type => :checkbox)
-        attrs.add_html_class!("checkbox")
-
+hidden_field(:name => attrs[:name], :value => off) + 
-      end
-      

plugins/merb_helpers/specs/merb_helpers_spec.rb

@@ -216 +216 @@
-  end
-  
+  it "should allow a user to set the :off value" do
+    form_for :obj do
+      checkbox_control(:baz, :off => "off", :on => "on").should match_tag(:input, :type =>"checkbox", :name => "fake_model[baz]", :class => "checkbox", :value => "on", :checked => "checked")
+      checkbox_control(:bat, :off => "off", :on => "on").should match_tag(:input, :type =>"checkbox", :name => "fake_model[bat]", :class => "checkbox", :value => "off")
+    end
+  end
+  
-  it "should render controls with errors if their attribute contains an error" do
-    form_for :obj do