Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #866292 by marcingy, ygerasimov, quicksketch, attiks, furamag: Fixed '0' not displayed as checkbox / radios options (nor as any element #title).

merge-requests/26/head
webchick 2011-12-22 02:14:53 -08:00
parent 4735a9bf59
commit fa4d4c5ce3
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/form.inc
View File

@ -3992,7 +3992,7 @@ function theme_form_element_label($variables) {
$t = get_t(); $t = get_t();
// If title and required marker are both empty, output no label. // If title and required marker are both empty, output no label.
if (empty($element['#title']) && empty($element['#required'])) { if ((!isset($element['#title']) || $element['#title'] === '') && empty($element['#required'])) {
return ''; return '';
} }

8
modules/simpletest/tests/form.test
View File

@ -588,9 +588,17 @@ class FormsElementsLabelsTestCase extends DrupalWebTestCase {
$elements = $this->xpath('//input[@id="edit-form-checkboxes-test-third-checkbox"]/following-sibling::label[@for="edit-form-checkboxes-test-third-checkbox" and @class="option"]'); $elements = $this->xpath('//input[@id="edit-form-checkboxes-test-third-checkbox"]/following-sibling::label[@for="edit-form-checkboxes-test-third-checkbox" and @class="option"]');
$this->assertTrue(isset($elements[0]), t("Label follows field and label option class correct for regular checkboxes.")); $this->assertTrue(isset($elements[0]), t("Label follows field and label option class correct for regular checkboxes."));
// Make sure the label is rendered for checkboxes.
$elements = $this->xpath('//input[@id="edit-form-checkboxes-test-0"]/following-sibling::label[@for="edit-form-checkboxes-test-0" and @class="option"]');
$this->assertTrue(isset($elements[0]), t("Label 0 found checkbox."));
$elements = $this->xpath('//input[@id="edit-form-radios-test-second-radio"]/following-sibling::label[@for="edit-form-radios-test-second-radio" and @class="option"]'); $elements = $this->xpath('//input[@id="edit-form-radios-test-second-radio"]/following-sibling::label[@for="edit-form-radios-test-second-radio" and @class="option"]');
$this->assertTrue(isset($elements[0]), t("Label follows field and label option class correct for regular radios.")); $this->assertTrue(isset($elements[0]), t("Label follows field and label option class correct for regular radios."));
// Make sure the label is rendered for radios.
$elements = $this->xpath('//input[@id="edit-form-radios-test-0"]/following-sibling::label[@for="edit-form-radios-test-0" and @class="option"]');
$this->assertTrue(isset($elements[0]), t("Label 0 found radios."));
// Exercise various defaults for checkboxes and modifications to ensure // Exercise various defaults for checkboxes and modifications to ensure
// appropriate override and correct behaviour. // appropriate override and correct behaviour.
$elements = $this->xpath('//input[@id="edit-form-checkbox-test"]/following-sibling::label[@for="edit-form-checkbox-test" and @class="option"]'); $elements = $this->xpath('//input[@id="edit-form-checkbox-test"]/following-sibling::label[@for="edit-form-checkbox-test" and @class="option"]');

2
modules/simpletest/tests/form_test.module
View File

@ -688,6 +688,7 @@ function form_label_test_form() {
'first-checkbox' => t('First checkbox'), 'first-checkbox' => t('First checkbox'),
'second-checkbox' => t('Second checkbox'), 'second-checkbox' => t('Second checkbox'),
'third-checkbox' => t('Third checkbox'), 'third-checkbox' => t('Third checkbox'),
'0' => t('0'),
), ),
); );
$form['form_radios_test'] = array( $form['form_radios_test'] = array(
@ -697,6 +698,7 @@ function form_label_test_form() {
'first-radio' => t('First radio'), 'first-radio' => t('First radio'),
'second-radio' => t('Second radio'), 'second-radio' => t('Second radio'),
'third-radio' => t('Third radio'), 'third-radio' => t('Third radio'),
'0' => t('0'),
), ),
// Test #field_prefix and #field_suffix placement. // Test #field_prefix and #field_suffix placement.
'#field_prefix' => '<span id="form-test-radios-field-prefix">' . t('Radios #field_prefix element') . '</span>', '#field_prefix' => '<span id="form-test-radios-field-prefix">' . t('Radios #field_prefix element') . '</span>',