Changeset 8978

Timestamp:

05/15/08 12:10:09 (2 months ago)

Author:

fabien

Message:

fixed sfWidgetFormSelect behavior for the value attribute which is now always present, even if the value is empty

Files:

• branches/1.1/lib/widget/sfWidgetFormSelect.class.php (modified) (1 diff)
• branches/1.1/test/unit/widget/sfWidgetFormSelectTest.php (modified) (2 diffs)

branches/1.1/lib/widget/sfWidgetFormSelect.class.php

@@ -95 +95 @@
-    return $options;
-  }
+
+  /**
+   * @see sfWidget
+   *
+   * We always generate an attribute for the value.
+   */
+  protected function attributesToHtmlCallback($k, $v)
+  {
+    return is_null($v) || ('' === $v && 'value' != $k) ? '' : sprintf(' %s="%s"', $k, $this->escapeOnce($v));
+  }
-}

branches/1.1/test/unit/widget/sfWidgetFormSelectTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-4
+6
-
-$dom = new DomDocument('1.0', 'utf-8');
@@ -24 +24 @@
-$t->is($css->matchSingle('#foo option[value="foobar"][selected="selected"]')->getValue(), 'foo', '->render() renders a select tag with the value selected');
-$t->is(count($css->matchAll('#foo option')->getNodes()), 2, '->render() renders all choices as option tags');
+
+// value attribute is always mandatory
+$w = new sfWidgetFormSelect(array('choices' => array('' => 'bar')));
+$t->like($w->render('foo', 'foobar'), '/<option value="">/', '->render() always generate a value attribute, even for empty keys');
+
+// other attributes are removed is empty
+$w = new sfWidgetFormSelect(array('choices' => array('' => 'bar')));
+$t->like($w->render('foo', 'foobar', array('class' => '', 'style' => null)), '/<option value="">/', '->render() always generate a value attribute, even for empty keys');
-
-// multiple select