Merge pull request #571 from UN-OCHA/develop

Deploy 31/01/2022 IASC-725

Author: left23

html/themes/custom/iasc_common_design/iasc_common_design.theme

@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\media\Entity\Media;
 
 /**
  * Implements template_preprocess_field().
@@ -125,6 +126,17 @@ function iasc_common_design_preprocess_node(&$variables) {
       $variables['event_time']['output'] = $variables['event_time']['start'] . ' — ' . $variables['event_time']['end'] . ' (' . $variables['event_time']['timezone'] . ')';
     }
   }
+
+  $bundle = $node->bundle();
+
+  if ($bundle == 'oa_wiki_page' && ($variables['elements']['#view_mode'] == 'teaser' || $variables['elements']['#view_mode'] == 'title')) {
+    $document_file = $node->get('field_media_files')->getValue();
+
+    if (!empty($document_file)) {
+      $entity = Media::load($document_file[0]['target_id']);
+      $variables['document_file'] = $entity->field_media_file->entity->createFileUrl();
+    }
+  }
 }
 
 /**

html/themes/custom/iasc_common_design/templates/node/node--oa-wiki-page--teaser.html.twig

@@ -83,7 +83,6 @@
 %}
 {{ attach_library('common_design/cd-teaser') }}
 
-{% 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) }}>
@@ -101,7 +100,7 @@
         {% if showPage %}
           <a href="{{ url }}" rel="bookmark">{{ label }}</a>
         {% else %}
-          <a href="{{ fileUrl }}" title="Download">{{ label }}</a>
+          <a href="{{ document_file }}" title="Download">{{ label }}</a>
         {% endif %}
       </h3>
     {% endif %}

html/themes/custom/iasc_common_design/templates/node/node--oa-wiki-page--title.html.twig

@@ -72,17 +72,16 @@
 #}
 {%
   set classes = [
-  'node',
-  'node--type-' ~ node.bundle|clean_class,
-  node.isPromoted() ? 'node--promoted',
-  node.isSticky() ? 'node--sticky',
-  not node.isPublished() ? 'node--unpublished',
-  view_mode ? 'node--view-mode-' ~ view_mode|clean_class
-]
+    'node',
+    'node--type-' ~ node.bundle|clean_class,
+    node.isPromoted() ? 'node--promoted',
+    node.isSticky() ? 'node--sticky',
+    not node.isPublished() ? 'node--unpublished',
+    view_mode ? 'node--view-mode-' ~ view_mode|clean_class
+  ]
 %}
 {{ attach_library('common_design/cd-bullet-list') }}
 
-{% 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) }}>
@@ -91,7 +90,7 @@
   {% if showPage %}
     <a href="{{ url }}" rel="bookmark">
   {% else %}
-    <a href="{{ fileUrl }}" title="Download">
+    <a href="{{ document_file }}" title="Download">
   {% endif %}
       {{ label }}
     </a>