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

Issue #3089523 by benjifisher, jhodgdon: Use progressive disclosure to hide Sort options on entity reference fields until bundles are selected 

(cherry picked from commit 75534512d6)
merge-requests/64/head
Lauri Eskola 2019-12-13 17:51:57 +02:00
parent 5be273c67b
commit 45b25f08b7
No known key found for this signature in database
GPG Key ID: 37E6EF00B7EEF188
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
View File

@ -254,6 +254,13 @@ class DefaultSelection extends SelectionPluginBase implements ContainerFactoryPl
'#limit_validation_errors' => [], '#limit_validation_errors' => [],
'#default_value' => $configuration['sort']['field'], '#default_value' => $configuration['sort']['field'],
]; ];
if ($entity_type->hasKey('bundle')) {
$form['sort']['field']['#states'] = [
'visible' => [
':input[name^="settings[handler_settings][target_bundles]["]' => ['checked' => TRUE],
],
];
}
$form['sort']['settings'] = [ $form['sort']['settings'] = [
'#type' => 'container', '#type' => 'container',

10
core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
View File

@ -101,9 +101,16 @@ class EntityReferenceAdminTest extends WebDriverTestBase {
$entity_type_id = 'node'; $entity_type_id = 'node';
// Check that the type label is correctly displayed. // Check that the type label is correctly displayed.
$assert_session->pageTextContains('Content type'); $assert_session->pageTextContains('Content type');
// Check that sort options are not yet visible.
$sort_by = $page->findField('settings[handler_settings][sort][field]');
$this->assertNotEmpty($sort_by);
$this->assertFalse($sort_by->isVisible(), 'The "sort by" options are hidden.');
// Select all bundles so that sort options are available.
$bundles = $this->container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id); $bundles = $this->container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id);
foreach ($bundles as $bundle_name => $bundle_info) { foreach ($bundles as $bundle_name => $bundle_info) {
$this->assertFieldByName('settings[handler_settings][target_bundles][' . $bundle_name . ']'); $this->assertFieldByName('settings[handler_settings][target_bundles][' . $bundle_name . ']');
$page->findField('settings[handler_settings][target_bundles][' . $bundle_name . ']')->setValue($bundle_name);
$assert_session->assertWaitOnAjaxRequest();
} }
reset($bundles); reset($bundles);
@ -143,8 +150,6 @@ class EntityReferenceAdminTest extends WebDriverTestBase {
$this->assertNoFieldByName('settings[handler_settings][sort][direction]'); $this->assertNoFieldByName('settings[handler_settings][sort][direction]');
// Third step: confirm. // Third step: confirm.
$page->findField('settings[handler_settings][target_bundles][' . key($bundles) . ']')->setValue(key($bundles));
$assert_session->assertWaitOnAjaxRequest();
$this->drupalPostForm(NULL, [ $this->drupalPostForm(NULL, [
'required' => '1', 'required' => '1',
], t('Save settings')); ], t('Save settings'));
@ -177,6 +182,7 @@ class EntityReferenceAdminTest extends WebDriverTestBase {
$this->drupalPostForm($bundle_path . '/fields/' . $field_name . '/storage', $edit, t('Save field settings')); $this->drupalPostForm($bundle_path . '/fields/' . $field_name . '/storage', $edit, t('Save field settings'));
$this->drupalGet($bundle_path . '/fields/' . $field_name); $this->drupalGet($bundle_path . '/fields/' . $field_name);
$this->assertFieldByName('settings[handler_settings][filter][type]', '_none'); $this->assertFieldByName('settings[handler_settings][filter][type]', '_none');
$this->assertFieldByName('settings[handler_settings][sort][field]', '_none');
// Switch the target type to 'node'. // Switch the target type to 'node'.
$field_name = 'node.' . $this->type . '.field_test'; $field_name = 'node.' . $this->type . '.field_test';