From 553e77cd998c60526355a8053a03bd9a355857ea Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 14 Sep 2015 22:31:12 +0100
Subject: [PATCH] Issue #2512306 by StryKaizer, bojanz, googletorp, JeroenT,
borisson_, tim.plunkett: Inline errors not shown for details elements
---
core/includes/form.inc | 6 +++
.../system/src/Tests/Form/ElementTest.php | 8 +++
.../system/templates/details.html.twig | 7 +++
.../modules/form_test/form_test.routing.yml | 8 +++
.../src/Form/FormTestDetailsForm.php | 51 +++++++++++++++++++
.../classy/templates/form/details.html.twig | 6 +++
6 files changed, 86 insertions(+)
create mode 100644 core/modules/system/tests/modules/form_test/src/Form/FormTestDetailsForm.php
diff --git a/core/includes/form.inc b/core/includes/form.inc
index efbac995cd96..aaaeb1707afe 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -257,6 +257,12 @@ function template_preprocess_details(&$variables) {
$variables['description'] = (!empty($element['#description'])) ? $element['#description'] : '';
$variables['children'] = (isset($element['#children'])) ? $element['#children'] : '';
$variables['value'] = (isset($element['#value'])) ? $element['#value'] : '';
+
+ // Display any error messages.
+ $variables['errors'] = NULL;
+ if (!empty($element['#errors']) && empty($element['#error_no_message'])) {
+ $variables['errors'] = $element['#errors'];
+ }
}
/**
diff --git a/core/modules/system/src/Tests/Form/ElementTest.php b/core/modules/system/src/Tests/Form/ElementTest.php
index 6555a4f063fb..b7295ff49e19 100644
--- a/core/modules/system/src/Tests/Form/ElementTest.php
+++ b/core/modules/system/src/Tests/Form/ElementTest.php
@@ -160,4 +160,12 @@ public function testFormAutocomplete() {
$this->assertEqual(count($result), 1, 'Ensure that the user does have access to the autocompletion');
}
+ /**
+ * Tests form element error messages.
+ */
+ public function testFormElementErrors() {
+ $this->drupalPostForm('form_test/details-form', [], 'Submit');
+ $this->assertText('I am an error on the details element.');
+ }
+
}
diff --git a/core/modules/system/templates/details.html.twig b/core/modules/system/templates/details.html.twig
index 1c0fd795eba1..cf50eb055e75 100644
--- a/core/modules/system/templates/details.html.twig
+++ b/core/modules/system/templates/details.html.twig
@@ -5,6 +5,7 @@
*
* Available variables
* - attributes: A list of HTML attributes for the details element.
+ * - errors: (optional) Any errors for this details element, may not be set.
* - title: (optional) The title of the element, may not be set.
* - description: (optional) The description of the element, may not be set.
* - children: (optional) The children of the element, may not be set.
@@ -20,6 +21,12 @@
<summary{{ summary_attributes }}>{{ title }}</summary>
{%- endif -%}
+ {% if errors %}
+ <div>
+ {{ errors }}
+ </div>
+ {% endif %}
+
{{ description }}
{{ children }}
{{ value }}
diff --git a/core/modules/system/tests/modules/form_test/form_test.routing.yml b/core/modules/system/tests/modules/form_test/form_test.routing.yml
index e4804048f839..a37990bdc284 100644
--- a/core/modules/system/tests/modules/form_test/form_test.routing.yml
+++ b/core/modules/system/tests/modules/form_test/form_test.routing.yml
@@ -402,6 +402,14 @@ form_test.button_class:
requirements:
_access: 'TRUE'
+form_test.details_form:
+ path: '/form_test/details-form'
+ defaults:
+ _form: '\Drupal\form_test\Form\FormTestDetailsForm'
+ _title: 'Form details form test'
+ requirements:
+ _access: 'TRUE'
+
form_test.description_display:
path: '/form_test/form-descriptions'
defaults:
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestDetailsForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestDetailsForm.php
new file mode 100644
index 000000000000..8944a4cc18ff
--- /dev/null
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestDetailsForm.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\form_test\Form\FormTestGroupContainerForm.
+ */
+
+namespace Drupal\form_test\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Builds a simple form to test the #group property on #type 'container'.
+ */
+class FormTestDetailsForm extends FormBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFormId() {
+ return 'form_test_details_form';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildForm(array $form, FormStateInterface $form_state) {
+ $form['meta'] = [
+ '#type' => 'details',
+ '#title' => 'Details element',
+ '#open' => TRUE,
+ ];
+ $form['submit'] = ['#type' => 'submit', '#value' => 'Submit'];
+ return $form;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validateForm(array &$form, FormStateInterface $form_state) {
+ $form_state->setErrorByName('meta', 'I am an error on the details element.');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function submitForm(array &$form, FormStateInterface $form_state) {
+ }
+
+}
diff --git a/core/themes/classy/templates/form/details.html.twig b/core/themes/classy/templates/form/details.html.twig
index 9b149d77b29d..a4ce6f63dde0 100644
--- a/core/themes/classy/templates/form/details.html.twig
+++ b/core/themes/classy/templates/form/details.html.twig
@@ -5,6 +5,7 @@
*
* Available variables
* - attributes: A list of HTML attributes for the details element.
+ * - errors: (optional) Any errors for this details element, may not be set.
* - title: (optional) The title of the element, may not be set.
* - description: (optional) The description of the element, may not be set.
* - children: (optional) The children of the element, may not be set.
@@ -18,6 +19,11 @@
<summary{{ summary_attributes }}>{{ title }}</summary>
{%- endif -%}
<div class="details-wrapper">
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
{%- if description -%}
<div class="details-description">{{ description }}</div>
{%- endif -%}
--
GitLab