summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt2
-rw-r--r--includes/form.inc2
-rw-r--r--modules/simpletest/tests/form.test32
-rw-r--r--modules/simpletest/tests/form_test.module27
4 files changed, 62 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 903a242..10980a1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
Drupal 7.17, xxxx-xx-xx (development version)
-----------------------
+- Fixed a bug which prevented required form elements without a title from being
+ given an "error" class when the form fails validation.
- Prevented duplicate HTML IDs from appearing when two forms are displayed on
the same page and one of them is submitted with invalid data (minor markup
change).
diff --git a/includes/form.inc b/includes/form.inc
index fa49839..aa90eca 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -4199,7 +4199,7 @@ function _form_set_class(&$element, $class = array()) {
if (!empty($element['#required'])) {
$element['#attributes']['class'][] = 'required';
}
- if (isset($element['#parents']) && form_get_error($element)) {
+ if (isset($element['#parents']) && form_get_error($element) !== NULL) {
$element['#attributes']['class'][] = 'error';
}
}
diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test
index 620621a..7eac198 100644
--- a/modules/simpletest/tests/form.test
+++ b/modules/simpletest/tests/form.test
@@ -190,6 +190,38 @@ class FormsTestCase extends DrupalWebTestCase {
}
/**
+ * Tests validation for required textfield element without title.
+ *
+ * Submits a test form containing a textfield form elements without title.
+ * The form is submitted twice, first without value for the required field
+ * and then with value. Each submission is checked for relevant error
+ * messages.
+ *
+ * @see form_test_validate_required_form_no_title()
+ */
+ function testRequiredTextfieldNoTitle() {
+ $form = $form_state = array();
+ $form = form_test_validate_required_form_no_title($form, $form_state);
+
+ // Attempt to submit the form with no required field set.
+ $edit = array();
+ $this->drupalPost('form-test/validate-required-no-title', $edit, 'Submit');
+ $this->assertNoRaw("The form_test_validate_required_form_no_title form was submitted successfully.", 'Validation form submitted successfully.');
+
+ // Check the page for the error class on the textfield.
+ $this->assertFieldByXPath('//input[contains(@class, "error")]', FALSE, 'Error input form element class found.');
+
+ // Submit again with required fields set and verify that there are no
+ // error messages.
+ $edit = array(
+ 'textfield' => $this->randomString(),
+ );
+ $this->drupalPost(NULL, $edit, 'Submit');
+ $this->assertNoFieldByXpath('//input[contains(@class, "error")]', FALSE, 'No error input form element class found.');
+ $this->assertRaw("The form_test_validate_required_form_no_title form was submitted successfully.", 'Validation form submitted successfully.');
+ }
+
+ /**
* Test default value handling for checkboxes.
*
* @see _form_test_checkbox()
diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module
index 6af18c6..b4d2f54 100644
--- a/modules/simpletest/tests/form_test.module
+++ b/modules/simpletest/tests/form_test.module
@@ -30,6 +30,13 @@ function form_test_menu() {
'access callback' => TRUE,
'type' => MENU_CALLBACK,
);
+ $items['form-test/validate-required-no-title'] = array(
+ 'title' => 'Form #required validation without #title',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('form_test_validate_required_form_no_title'),
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
+ );
$items['form-test/limit-validation-errors'] = array(
'title' => 'Form validation with some error suppression',
'page callback' => 'drupal_get_form',
@@ -413,6 +420,26 @@ function form_test_validate_required_form_submit($form, &$form_state) {
}
/**
+ * Form constructor to test the #required property without #title.
+ */
+function form_test_validate_required_form_no_title($form, &$form_state) {
+ $form['textfield'] = array(
+ '#type' => 'textfield',
+ '#required' => TRUE,
+ );
+ $form['actions'] = array('#type' => 'actions');
+ $form['actions']['submit'] = array('#type' => 'submit', '#value' => 'Submit');
+ return $form;
+}
+
+/**
+ * Form submission handler for form_test_validate_required_form_no_title().
+ */
+function form_test_validate_required_form_no_title_submit($form, &$form_state) {
+ drupal_set_message('The form_test_validate_required_form_no_title form was submitted successfully.');
+}
+
+/**
* Builds a simple form with a button triggering partial validation.
*/
function form_test_limit_validation_errors_form($form, &$form_state) {