Merge pull request #568 from UN-OCHA/develop

[IASC-725] Fix conditional link generation in the template for Drupal 9.3 compatibility.
UN-OCHA · Jan 25, 2022 · 30825fc · 30825fc
2 parents dd995d8 + 13ba2e5
commit 30825fc
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 12 deletions.
diff --git a/html/themes/custom/iasc_common_design/package-lock.json b/html/themes/custom/iasc_common_design/package-lock.json
diff --git a/html/themes/custom/iasc_common_design/templates/node/node--oa-wiki-page--teaser.html.twig b/html/themes/custom/iasc_common_design/templates/node/node--oa-wiki-page--teaser.html.twig
@@ -83,7 +83,7 @@
 %}
 {{ attach_library('common_design/cd-teaser') }}
 
-{% set fileUrl = file_url(content.field_media_files[0]['#media'].field_media_file.entity.uri.value) %}
+{% set fileUrl = node.field_media_files.0.entity.uri.value ? file_url(node.field_media_files.0.entity.uri.value) :  url  %}
 {% set showPage = node.field_oa_wiki_page_no_redirect.0.value %}
 
 <article{{ attributes.addClass(classes) }}>

diff --git a/html/themes/custom/iasc_common_design/templates/node/node--oa-wiki-page--title.html.twig b/html/themes/custom/iasc_common_design/templates/node/node--oa-wiki-page--title.html.twig
@@ -81,7 +81,8 @@
 ]
 %}
 {{ attach_library('common_design/cd-bullet-list') }}
-{% set fileUrl = file_url(content.field_media_files[0]['#media'].field_media_file.entity.uri.value) %}
+
+{% set fileUrl = node.field_media_files.0.entity.uri.value ? file_url(node.field_media_files.0.entity.uri.value) : url  %}
 {% set showPage = node.field_oa_wiki_page_no_redirect.0.value %}
 
 <article{{ attributes.addClass(classes) }}>

diff --git a/package-lock.json b/package-lock.json