EWPP-4750: Fix the extra_attributes variable in node templates.

openeuropa · Oct 14, 2024 · 20b5453 · 20b5453
1 parent f2e5b3f
commit 20b5453
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 31 deletions.
diff --git a/templates/content/node--oe-call-proposals--teaser.html.twig b/templates/content/node--oe-call-proposals--teaser.html.twig
@@ -16,8 +16,6 @@
   {% set additional_information = additional_information|merge([additional_information_items]) %}
 {% endif %}
 
-{% set extra_attributes = [] %}
-
 {# Add cache info from status field. #}
 {% set bubble_cache = content.extra_field_oe_call_proposals_label_status|render %}
 {% block content %}
@@ -29,6 +27,6 @@
     'lists_variant': 'vertical',
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-call-tenders--teaser.html.twig b/templates/content/node--oe-call-tenders--teaser.html.twig
@@ -16,8 +16,6 @@
   {% set additional_information = additional_information|merge([additional_information_items]) %}
 {% endif %}
 
-{% set extra_attributes = [] %}
-
 {# Add cache info from status field. #}
 {% set bubble_cache = content.extra_field_oe_call_tenders_label_status|render %}
 {% block content %}
@@ -29,6 +27,6 @@
     'lists_variant': 'vertical',
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-consultation--teaser.html.twig b/templates/content/node--oe-consultation--teaser.html.twig
@@ -16,8 +16,6 @@
   {% set additional_information = additional_information|merge([additional_information_items]) %}
 {% endif %}
 
-{% set extra_attributes = [] %}
-
 {# Add cache info from status field. #}
 {% set bubble_cache = content.extra_field_oe_consultation_label_status|render %}
 {% block content %}
@@ -29,6 +27,6 @@
     'lists_variant': 'vertical',
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-event--teaser.html.twig b/templates/content/node--oe-event--teaser.html.twig
@@ -11,7 +11,6 @@
 {% endif %}
 {% set detail = content.extra_field_oe_theme_content_event_teaser_details %}
 {% set additional_information = [] %}
-{% set extra_attributes = [] %}
 {% block content %}
   {{ pattern('list_item', {
     'variant': variant|default('date'),
@@ -24,6 +23,6 @@
     'lists_variant': 'vertical',
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-news--teaser.html.twig b/templates/content/node--oe-news--teaser.html.twig
@@ -14,7 +14,6 @@
 ] %}
 {% set detail = content.oe_teaser|field_value %}
 {% set additional_information = [] %}
-{% set extra_attributes = [] %}
 {% apply spaceless %}
   {% block content %}
     {{ pattern('list_item', {
@@ -28,7 +27,7 @@
       'lists_variant': 'vertical',
       'badges': badges,
       'external_link': external_link,
-      'extra_attributes': extra_attributes,
+      'extra_attributes': extra_attributes|default([]),
     }) }}
   {% endblock %}
 {% endapply %}
diff --git a/templates/content/node--oe-organisation--teaser.html.twig b/templates/content/node--oe-organisation--teaser.html.twig
@@ -20,8 +20,6 @@
   {% endfor %}
 {% endif %}
 
-{% set extra_attributes = [] %}
-
 {% block content %}
   {{ pattern('list_item', {
     'variant': 'thumbnail_secondary',
@@ -37,6 +35,6 @@
     'image': image_url ? { 'src': image_url },
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-page--teaser.html.twig b/templates/content/node--oe-page--teaser.html.twig
@@ -4,7 +4,6 @@
  * Teaser template implementation for "Page" content type.
  */
 #}
-{% set extra_attributes = [] %}
 {% block content %}
   {{ pattern('list_item', {
     'variant': 'default',
@@ -15,6 +14,6 @@
     'lists_variant': 'vertical',
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-person--teaser.html.twig b/templates/content/node--oe-person--teaser.html.twig
@@ -45,8 +45,6 @@
   {% set additional_information = additional_information|merge([additional_information_items]) %}
 {% endif %}
 
-{% set extra_attributes = [] %}
-
 {% block content %}
   {{ pattern('list_item', {
     'variant': 'thumbnail_secondary',
@@ -59,6 +57,6 @@
     'image': content.portrait_image ? { 'src': content.portrait_image|render },
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-policy--teaser.html.twig b/templates/content/node--oe-policy--teaser.html.twig
@@ -4,7 +4,6 @@
  * Teaser template implementation for "Policy" content type.
  */
 #}
-{% set extra_attributes = [] %}
 {% block content %}
   {{ pattern('list_item', {
     'variant': 'default',
@@ -15,6 +14,6 @@
     'lists_variant': 'vertical',
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-project--teaser.html.twig b/templates/content/node--oe-project--teaser.html.twig
@@ -17,8 +17,6 @@
   {% set additional_information = additional_information|merge([additional_information_items]) %}
 {% endif %}
 
-{% set extra_attributes = [] %}
-
 {% block content %}
   {{ pattern('list_item', {
     'variant': 'thumbnail_secondary',
@@ -30,6 +28,6 @@
     'image': image_url ? { 'src': image_url },
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/content/node--oe-publication--teaser.html.twig b/templates/content/node--oe-publication--teaser.html.twig
@@ -5,7 +5,6 @@
  */
 #}
 {% set image_url = content.oe_publication_thumbnail|field_value|render %}
-{% set extra_attributes = [] %}
 {% block content %}
   {{ pattern('list_item', {
     'variant': 'thumbnail_secondary',
@@ -22,6 +21,6 @@
     'lists_variant': 'vertical',
     'badges': badges,
     'external_link': external_link,
-    'extra_attributes': extra_attributes,
+    'extra_attributes': extra_attributes|default([]),
   }) }}
 {% endblock %}
diff --git a/templates/patterns/highlighted_list/pattern-highlighted-list--variant-four-columns.html.twig b/templates/patterns/highlighted_list/pattern-highlighted-list--variant-four-columns.html.twig
@@ -26,7 +26,7 @@
       'image_position': (loop.first or loop.index == 4) ? 'top' : '',
       'divider': (loop.index == 2 or loop.index == 5) ? true : false,
       'extra_classes': (loop.index == 2 or loop.index == 5) ? 'ecl-u-flex-grow-1 ecl-u-mb-m' : 'ecl-u-flex-grow-1',
-      'contextual_links': item.contextual_links
+      'contextual_links': item.contextual_links,
       'extra_attributes': item.extra_attributes|default([]),
     }, 'default') %}
     {% set _items = _items|merge([_item]) %}

diff --git a/templates/patterns/highlighted_list/pattern-highlighted-list.html.twig b/templates/patterns/highlighted_list/pattern-highlighted-list.html.twig
@@ -22,7 +22,7 @@
     'image_position': 'top',
     'divider': true,
     'extra_classes': 'ecl-u-flex-grow-1',
-    'contextual_links': highlighted_item.contextual_links
+    'contextual_links': highlighted_item.contextual_links,
     'extra_attributes': highlighted_item.extra_attributes|default([]),
   }, 'default') %}
 {% endif %}
@@ -46,7 +46,7 @@
       'image_position': loop.first ? 'top' : '',
       'divider': true,
       'extra_classes': loop.last ? 'ecl-u-flex-grow-1' : 'ecl-u-flex-grow-1 ecl-u-mb-m',
-      'contextual_links': item.contextual_links
+      'contextual_links': item.contextual_links,
       'extra_attributes': item.extra_attributes|default([]),
     }, 'default') %}
     {% set _items = _items|merge([_item]) %}