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

Issue #2756689 by tameeshb, geertvd, arunkumark, claudiu.cristea, Berdir: Label of contact form message field is not hidden

8.4.x
Alex Pott 2017-03-14 09:23:44 +00:00
parent ade9d780ae
commit e27d0da593
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/modules/contact/src/MessageViewBuilder.php
View File

@ -23,25 +23,6 @@ class MessageViewBuilder extends EntityViewBuilder {
return $build; return $build;
} }
/**
* {@inheritdoc}
*/
public function buildComponents(array &$build, array $entities, array $displays, $view_mode) {
parent::buildComponents($build, $entities, $displays, $view_mode);
foreach ($entities as $id => $entity) {
// Add the message extra field, if enabled.
$display = $displays[$entity->bundle()];
if ($entity->getMessage() && $display->getComponent('message')) {
$build[$id]['message'] = [
'#type' => 'item',
'#title' => t('Message'),
'#plain_text' => $entity->getMessage(),
];
}
}
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

30
core/modules/contact/tests/src/Functional/ContactSitewideTest.php
View File

@ -50,6 +50,7 @@ class ContactSitewideTest extends BrowserTestBase {
'administer contact forms', 'administer contact forms',
'administer users', 'administer users',
'administer account settings', 'administer account settings',
'administer contact_message display',
'administer contact_message fields', 'administer contact_message fields',
'administer contact_message form display', 'administer contact_message form display',
]); ]);
@ -343,6 +344,35 @@ class ContactSitewideTest extends BrowserTestBase {
$result = $this->xpath('//div[@role=:role]', [':role' => 'contentinfo']); $result = $this->xpath('//div[@role=:role]', [':role' => 'contentinfo']);
$this->assertEqual(count($result), 0, 'Messages not found.'); $this->assertEqual(count($result), 0, 'Messages not found.');
$this->assertUrl('user/' . $admin_user->id()); $this->assertUrl('user/' . $admin_user->id());
// Test preview and visibility of the message field and label. Submit the
// contact form and verify the content.
$edit = [
'subject[0][value]' => $this->randomMachineName(),
'message[0][value]' => $this->randomMachineName(),
$field_name . '[0][value]' => $this->randomMachineName(),
];
$this->drupalPostForm($form->toUrl('canonical'), $edit, t('Preview'));
// Message is now by default displayed twice, once for the form element and
// once for the viewed message.
$page_text = $this->getSession()->getPage()->getText();
$this->assertGreaterThan(1, substr_count($page_text, t('Message')));
$this->assertSession()->responseContains('class="field field--name-message field--type-string-long field--label-above');
$this->assertSession()->pageTextContains($edit['message[0][value]']);
// Hide the message field label.
$display_edit = [
'fields[message][label]' => 'hidden',
];
$this->drupalPostForm('admin/structure/contact/manage/' . $contact_form . '/display', $display_edit, t('Save'));
$this->drupalPostForm($form->toUrl('canonical'), $edit, t('Preview'));
// Message should only be displayed once now.
$page_text = $this->getSession()->getPage()->getText();
$this->assertEquals(1, substr_count($page_text, t('Message')));
$this->assertSession()->responseContains('class="field field--name-message field--type-string-long field--label-hidden field__item">');
$this->assertSession()->pageTextContains($edit['message[0][value]']);
} }
/** /**