Skip to content
Snippets Groups Projects
Commit ec4f2906 authored by jurgenhaas's avatar jurgenhaas
Browse files

Update patch for entity_import

parent 75ef493c
No related branches found
No related tags found
1 merge request!307Merging develop into main
Pipeline #1312165 passed
......@@ -107,7 +107,7 @@
"drupal/entity_import": {
"#3061935 Make it work without content_translation": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3061935.diff",
"#3327582 Delimiter and file extension": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3327582.diff",
"#3327593 Operators for lookup": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3327593.diff"
"#3327593 Operators for lookup": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3327593.diff?v=2"
},
"drupal/entity_share": {
"#3306745 File Share overrides the name of media entity": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3306745.diff",
......
diff --git a/modules/entity_import_plus/src/Plugin/migrate/process/EntityImportPlusEntityLookup.php b/modules/entity_import_plus/src/Plugin/migrate/process/EntityImportPlusEntityLookup.php
index 2ccf563350fa324d76f025804893b695416fc849..8c1b83566b235fdd1f6254d64edbb695f5b11dc3 100644
index c73b459d7122dc5947dfeeec655b0c9fc654e742..017c530b6b875fdaaa7549288c62c5a7019470bc 100644
--- a/modules/entity_import_plus/src/Plugin/migrate/process/EntityImportPlusEntityLookup.php
+++ b/modules/entity_import_plus/src/Plugin/migrate/process/EntityImportPlusEntityLookup.php
@@ -14,6 +14,7 @@ use Drupal\entity_import\Plugin\migrate\process\EntityImportProcessInterface;
@@ -12,6 +12,7 @@ use Drupal\Core\Form\FormStateInterface;
use Drupal\entity_import\Plugin\migrate\process\EntityImportProcessInterface;
use Drupal\entity_import\Plugin\migrate\process\EntityImportProcessTrait;
use Drupal\field\FieldStorageConfigInterface;
use Drupal\migrate\Annotation\MigrateProcessPlugin;
+use Drupal\migrate\MigrateException;
use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate_plus\Plugin\migrate\process\EntityLookup;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -99,6 +100,7 @@ class EntityImportPlusEntityLookup extends EntityLookup implements EntityImportP
@@ -88,6 +89,7 @@ class EntityImportPlusEntityLookup extends EntityLookup implements EntityImportP
'bundle_key' => NULL,
'entity_type' => NULL,
'ignore_case' => FALSE,
......@@ -18,9 +18,9 @@ index 2ccf563350fa324d76f025804893b695416fc849..8c1b83566b235fdd1f6254d64edbb695
];
}
@@ -166,12 +168,25 @@ class EntityImportPlusEntityLookup extends EntityLookup implements EntityImportP
@@ -155,12 +157,26 @@ class EntityImportPlusEntityLookup extends EntityLookup implements EntityImportP
'#description' => $this->t('If checked then value casing is irrelevant.'),
'#default_value' => $this->getFormStateValue('ignore_case', $form_state, FALSE)
'#default_value' => $this->getFormStateValue('ignore_case', $form_state, FALSE),
];
+ $form['operator'] = [
+ '#type' => 'select',
......@@ -40,11 +40,12 @@ index 2ccf563350fa324d76f025804893b695416fc849..8c1b83566b235fdd1f6254d64edbb695
/**
* {@inheritdoc}
+ *
+ * @throws \Drupal\migrate\MigrateException
*/
protected function query($value) {
// Entity queries typically are case-insensitive. Therefore, we need to
@@ -181,10 +196,19 @@ class EntityImportPlusEntityLookup extends EntityLookup implements EntityImportP
@@ -170,10 +186,19 @@ class EntityImportPlusEntityLookup extends EntityLookup implements EntityImportP
$ignoreCase = !empty($this->configuration['ignore_case']) ?: FALSE;
$multiple = is_array($value);
......
......@@ -103,7 +103,7 @@
"drupal/entity_import": {
"#3061935 Make it work without content_translation": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3061935.diff",
"#3327582 Delimiter and file extension": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3327582.diff",
"#3327593 Operators for lookup": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3327593.diff"
"#3327593 Operators for lookup": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3327593.diff?v=2"
},
"drupal/entity_share": {
"#3306745 File Share overrides the name of media entity": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3306745.diff",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment