Changeset 8695

Timestamp:

04/30/08 18:21:59 (6 months ago)

Author:

FabianLange

Message:

sf1.0: made sfFillInForm work with checkbox arrays as well like checkbox_many[]. including unit tests. fixes #1776, #3399

Files:

• branches/1.0/lib/util/sfFillInForm.class.php (modified) (1 diff)
• branches/1.0/test/unit/util/sfFillInFormTest.php (modified) (6 diffs)

branches/1.0/lib/util/sfFillInForm.class.php

@@ -126 +126 @@
-          // checkbox and radio
-          $element->removeAttribute('checked');
-
+
+
+
+
+
+
+
+
-          {
-            $element->setAttribute('checked', 'checked');

branches/1.0/test/unit/util/sfFillInFormTest.php

@@ -12 +12 @@
-require_once($_test_dir.'/../lib/util/sfFillInForm.class.php');
-
-0
+3
-
-$html = <<<EOF
@@ -23 +23 @@
-    <input type="checkbox" name="input_checkbox" value="1" checked="checked" />
-    <input type="checkbox" name="input_checkbox_not_checked" value="1" />
+    <input type="checkbox" name="input_checkbox_multiple[]" value="1" checked="checked" />
+    <input type="checkbox" name="input_checkbox_multiple[]" value="2" />
+    <input type="radio" name="input_radio" value="1" checked="checked" />
-    <input type="password" name="password" value="" />
-    <textarea name="textarea">content</textarea>
@@ -71 +74 @@
-$t->is(get_input_value($xml, 'input_checkbox', 'checked'), 'checked', '->fillInDom() preserves default values for checkbox');
-$t->is(get_input_value($xml, 'input_checkbox_not_checked', 'checked'), '', '->fillInDom() preserves default values for checkbox');
+$t->is(get_input_value($xml, 'input_radio', 'checked'), 'checked', '->fillInDom() preserves default values for radio');
+$t->is(get_input_value($xml, 'input_checkbox_multiple[]', 'checked'), array('checked', null), '->fillInDom() preserves default values for multiple checkboxes');
-$t->is($xml->xpath('//form[@name="form1"]/textarea'), array('content'), '->fillInDom() preserves default values for textarea');
-$t->is($xml->xpath('//form[@name="form1"]/select[@name="select"]/option[@selected="selected"]'), array('selected'), '->fillInDom() preserves default values for select');
@@ -123 +128 @@
-  'input_checkbox' => false,
-  'input_checkbox_not_checked' => true,
+  'input_checkbox_multiple[]' => array(2),
-  'password' => 'mypassword',
-  'select' => 'first',
@@ -139 +145 @@
-$t->is(get_input_value($xml, 'input_checkbox', 'checked'), '', '->fillInDom() fills in values for checkbox');
-$t->is(get_input_value($xml, 'input_checkbox_not_checked', 'checked'), 'checked', '->fillInDom() fills in values for checkbox');
+$t->is(get_input_value($xml, 'input_checkbox_multiple[]', 'checked'), array(null, 'checked'), '->fillInDom() fills in values for multiple checkboxes');
-$t->is($xml->xpath('//form[@name="form1"]/textarea'), array('my content'), '->fillInDom() fills in values for textarea');
-$t->is($xml->xpath('//form[@name="form1"]/select[@name="select"]/option[@selected="selected"]'), array('first'), '->fillInDom() fills in values for select');
@@ -183 +190 @@
-function get_input_value($xml, $name, $attribute = 'value', $form = null)
-{
+  $value = "";
+
-  $xpath = ($form ? '//form[@name="'.$form.'"]' : '//form').sprintf('/input[@name="%s"]', $name);
-
-  $values = $xml->xpath($xpath);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-