Merge pull request #326 from openeuropa/OPENEUROPA-2280-2

OPENEUROPA-2280: Not correct spacing between "Listing item block" paragraph
openeuropa · Sep 23, 2019 · ca43534 · ca43534
2 parents 153bd47 + 18cf761
commit ca43534
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/oe_theme.theme b/oe_theme.theme
@@ -82,7 +82,15 @@ function oe_theme_theme_suggestions_field_alter(array &$suggestions, array $vari
 
   // Add suggestions for all 'Entity reference revisions' for each target type.
   if ($variables['element']['#field_type'] === 'entity_reference_revisions') {
-    $suggestions[] = 'field__' . $variables['element']['#field_type'] . '__' . $variables['element']['#items']->getFieldDefinition()->getSetting('target_type');
+    /** @var \Drupal\field\Entity\FieldConfig $field_definition */
+    $field_definition = $variables['element']['#items']->getFieldDefinition();
+    // Add suggestions based on the referenced entity type.
+    $suggestions[] = 'field__entity_reference_revisions__' . $field_definition->getSetting('target_type');
+    $suggestions[] = 'field__entity_reference_revisions__' . $field_definition->getSetting('target_type') . '__' . $field_definition->getName();
+
+    // Add suggestions based on the parent entity and bundle types.
+    $suggestions[] = 'field__entity_reference_revisions__' . $variables['element']['#entity_type'] . '__' . $variables['element']['#bundle'];
+    $suggestions[] = 'field__entity_reference_revisions__' . $variables['element']['#entity_type'] . '__' . $variables['element']['#bundle'] . '__' . $field_definition->getName();
   }
 }
 

diff --git a/...-entity-reference-revisions--paragraph--oe-list-item-block--field-oe-paragraphs.html.twig b/...-entity-reference-revisions--paragraph--oe-list-item-block--field-oe-paragraphs.html.twig
@@ -0,0 +1,9 @@
+{#
+/**
+ * @file
+ * Theme override for the entity reference revisions field wich allowed to use paragraphs.
+ *
+ * @see ./templates/field/field--bare.html.twig
+ */
+#}
+{%- include 'field--bare.html.twig' -%}