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

Issue #2247211 by blueminds, amateescu, xjm: Fixed Autocomplete widget doesn't work on entity labels without a " (entity_id)" suffix.

8.0.x
Alex Pott 2014-06-03 00:31:57 -05:00
parent 1b49539704
commit 6e7dfbc0b7
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/entity_reference/src/Plugin/Type/Selection/SelectionInterface.php
View File

@ -24,8 +24,9 @@ interface SelectionInterface {
* Returns a list of referenceable entities.
*
* @return array
* An array of referenceable entities. Keys are entity IDs and
* values are (safe HTML) labels to be displayed to the user.
* A nested array of entities, the first level is keyed by the
* entity bundle, which contains an array of entity labels (safe HTML),
* keyed by the entity ID.
*/
public function getReferenceableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0);

6
core/modules/entity_reference/src/Plugin/entity_reference/selection/SelectionBase.php
View File

@ -220,7 +220,11 @@ class SelectionBase implements SelectionInterface {
* {@inheritdoc}
*/
public function validateAutocompleteInput($input, &$element, &$form_state, $form, $strict = TRUE) {
$entities = $this->getReferenceableEntities($input, '=', 6);
$bundled_entities = $this->getReferenceableEntities($input, '=', 6);
$entities = array();
foreach ($bundled_entities as $entities_list) {
$entities += $entities_list;
}
$params = array(
'%value' => $input,
'@value' => $input,

6
core/modules/entity_reference/src/Tests/EntityReferenceIntegrationTest.php
View File

@ -79,7 +79,8 @@ class EntityReferenceIntegrationTest extends WebTestBase {
'name' => $entity_name,
'user_id' => mt_rand(0, 128),
$this->fieldName . '[0][target_id]' => $referenced_entities[0]->label() . ' (' . $referenced_entities[0]->id() . ')',
$this->fieldName . '[1][target_id]' => $referenced_entities[1]->label() . ' (' . $referenced_entities[1]->id() . ')',
// Test an input of the entity label without a ' (entity_id)' suffix.
$this->fieldName . '[1][target_id]' => $referenced_entities[1]->label(),
);
$this->drupalPostForm($this->entityType . '/add', $edit, t('Save'));
$this->assertFieldValues($entity_name, $referenced_entities);
@ -97,7 +98,8 @@ class EntityReferenceIntegrationTest extends WebTestBase {
$entity_name = $this->randomName();
$target_id = $referenced_entities[0]->label() . ' (' . $referenced_entities[0]->id() . ')';
$target_id .= ', ' . $referenced_entities[1]->label() . ' (' . $referenced_entities[1]->id() . ')';
// Test an input of the entity label without a ' (entity_id)' suffix.
$target_id .= ', ' . $referenced_entities[1]->label();
$edit = array(
'name' => $entity_name,
'user_id' => mt_rand(0, 128),