From 8201782b6fe4b98412eea15e42e3befa88faa685 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Mon, 6 Sep 2021 15:34:23 +0200
Subject: [PATCH] Properly check for images

Do not check for models, but actual file.
They might be missing, e.g. cause not downloaded from production into
dev environment.

The new checks ensure the page will not break with an exception, but
show default images.
---
 Resources/Private/Partials/Date/ListDefault.html | 4 ++--
 Resources/Private/Partials/Date/ListTable.html   | 4 ++--
 Resources/Private/Templates/Date/Show.html       | 4 ++--
 Resources/Private/Templates/Date/Teaser.html     | 6 +++---
 Resources/Private/Templates/Event/List.html      | 6 +++---
 Resources/Private/Templates/Event/Search.html    | 6 +++---
 Resources/Private/Templates/Event/Show.html      | 6 +++---
 Resources/Private/Templates/Event/Teaser.html    | 6 +++---
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Resources/Private/Partials/Date/ListDefault.html b/Resources/Private/Partials/Date/ListDefault.html
index c62a6fb..dfc44c8 100644
--- a/Resources/Private/Partials/Date/ListDefault.html
+++ b/Resources/Private/Partials/Date/ListDefault.html
@@ -3,10 +3,10 @@
     <f:for each="{dates}" as="date">
         <div class="col-sm-12 col-md-6 col-lg-4 col-xl-4">
             <div class="menu-tile">
-                <f:if condition="{date.event.images}">
+                <f:if condition="{date.event.images.0}">
                     <f:then>
                         <f:link.action pageUid="{settings.showPID}" action="show" controller="Date" arguments="{date: date}">
-                            <f:image src="{date.event.images.originalResource.originalFile.uid}" alt="{date.event.title}" title="{date.event.title}" width="480c" height="320c" class="img-fluid img-thumbnail"/>
+                            <f:image image="{date.event.images.0}" alt="{date.event.title}" title="{date.event.title}" width="480c" height="320c" class="img-fluid img-thumbnail"/>
                         </f:link.action>
                     </f:then>
                     <f:else>
diff --git a/Resources/Private/Partials/Date/ListTable.html b/Resources/Private/Partials/Date/ListTable.html
index d959692..7dd747e 100644
--- a/Resources/Private/Partials/Date/ListTable.html
+++ b/Resources/Private/Partials/Date/ListTable.html
@@ -30,10 +30,10 @@
                 <f:format.crop maxCharacters="150">{date.event.details}</f:format.crop>
             </div>
             <div class="col-4">
-                <f:if condition="{date.event.images}">
+                <f:if condition="{date.event.images.0}">
                     <f:then>
                         <f:link.action pageUid="{settings.showPID}" action="show" controller="Date" arguments="{date: date}">
-                            <f:image src="{date.event.images.originalResource.originalFile.uid}" alt="" width="400c" height="280c" class="img-fluid img-thumbnail"/>
+                            <f:image image="{date.event.images.0}" alt="" width="400c" height="280c" class="img-fluid img-thumbnail"/>
                         </f:link.action>
                     </f:then>
                     <f:else>
diff --git a/Resources/Private/Templates/Date/Show.html b/Resources/Private/Templates/Date/Show.html
index 4929454..77b36a9 100644
--- a/Resources/Private/Templates/Date/Show.html
+++ b/Resources/Private/Templates/Date/Show.html
@@ -3,9 +3,9 @@
     <f:section name="content">
         <div class="row">
             <div class="col-6">
-                <f:if condition="{date.event.images}">
+                <f:if condition="{date.event.images.0}">
                     <f:then>
-                        <f:image src="{date.event.images.originalResource.originalFile.uid}" alt="" width="480c" height="320c" class="img-fluid img-thumbnail"/>
+                        <f:image image="{date.event.images.0}" alt="" width="480c" height="320c" class="img-fluid img-thumbnail"/>
                     </f:then>
                     <f:else>
                         <img src="{settings.defaultImagePath}" alt="Dummy" width="480c" height="320c" class="img-fluid img-thumbnail"/>
diff --git a/Resources/Private/Templates/Date/Teaser.html b/Resources/Private/Templates/Date/Teaser.html
index 4f2f9de..fc1bf56 100644
--- a/Resources/Private/Templates/Date/Teaser.html
+++ b/Resources/Private/Templates/Date/Teaser.html
@@ -10,10 +10,10 @@
                     -->
                 </f:comment>
                 <div class="menu-tile">
-                    <f:if condition="{date.event.images}">
+                    <f:if condition="{date.event.images.0}">
                         <f:then>
                             <f:link.action pageUid="{settings.showPID}" action="show" controller="Event" arguments="{event: event}">
-                                <f:image src="{date.event.images.originalResource.originalFile.uid}" alt="{date.event.title}" title="{date.event.title}"  width="480c" height="320c" class="img-fluid img-thumbnail"/>
+                                <f:image image="{date.event.images.0}" alt="{date.event.title}" title="{date.event.title}"  width="480c" height="320c" class="img-fluid img-thumbnail"/>
                             </f:link.action>
                         </f:then>
                         <f:else>
@@ -39,4 +39,4 @@
         </f:for>
     </div>
 </f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Templates/Event/List.html b/Resources/Private/Templates/Event/List.html
index d9ec46f..50707dd 100644
--- a/Resources/Private/Templates/Event/List.html
+++ b/Resources/Private/Templates/Event/List.html
@@ -6,10 +6,10 @@
             <f:for each="{events}" as="event">
                 <div class="col-sm-12 col-md-6 col-lg-4 col-xl-4">
                     <div class="menu-tile">
-                        <f:if condition="{event.images}">
+                        <f:if condition="{event.images.0}">
                             <f:then>
                                 <f:link.action pageUid="{settings.showPID}" action="show" controller="Event" arguments="{event: event}">
-                                    <f:image src="{event.images.originalResource.originalFile.uid}" alt="{date.event.title}" title="{date.event.title}" width="480c" height="320c" class="img-fluid img-thumbnail"/>
+                                    <f:image image="{event.images.0}" alt="{date.event.title}" title="{date.event.title}" width="480c" height="320c" class="img-fluid img-thumbnail"/>
                                 </f:link.action>
                             </f:then>
                             <f:else>
@@ -30,4 +30,4 @@
             </f:for>
         </div>
     </f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Templates/Event/Search.html b/Resources/Private/Templates/Event/Search.html
index 2e5cd72..111d621 100644
--- a/Resources/Private/Templates/Event/Search.html
+++ b/Resources/Private/Templates/Event/Search.html
@@ -4,10 +4,10 @@
     <f:for each="{events}" as="event">
         <div class="col-sm-12 col-md-6 col-lg-4 col-xl-4">
             <div class="menu-tile">
-                <f:if condition="{event.images}">
+                <f:if condition="{event.images.0}">
                     <f:then>
                         <f:link.action pageUid="{settings.showPID}" action="show" controller="Event" arguments="{event: event}">
-                            <f:image src="{event.images.originalResource.originalFile.uid}" alt="" width="480c" height="320c" class="img-fluid img-thumbnail"/>
+                            <f:image image="{event.images.0}" alt="" width="480c" height="320c" class="img-fluid img-thumbnail"/>
                         </f:link.action>
                     </f:then>
                     <f:else>
@@ -26,4 +26,4 @@
             </div>
         </div>
     </f:for>
-</div>
\ No newline at end of file
+</div>
diff --git a/Resources/Private/Templates/Event/Show.html b/Resources/Private/Templates/Event/Show.html
index 49d418b..4ede781 100644
--- a/Resources/Private/Templates/Event/Show.html
+++ b/Resources/Private/Templates/Event/Show.html
@@ -3,10 +3,10 @@
     <f:section name="content">
         <div class="row">
             <div class="col-6">
-                <f:if condition="{event.images}">
+                <f:if condition="{event.images.0}">
                     <f:then>
                         <f:link.action pageUid="{settings.showPID}" action="show" controller="Event" arguments="{event: event}">
-                            <f:image src="{event.images.originalResource.originalFile.uid}" alt="" width="480c" height="320c" class="img-fluid img-thumbnail"/>
+                            <f:image image="{event.images.0}" alt="" width="480c" height="320c" class="img-fluid img-thumbnail"/>
                         </f:link.action>
                     </f:then>
                     <f:else>
@@ -34,4 +34,4 @@
             </div>
         </div>
     </f:section>
-</html>
\ No newline at end of file
+</html>
diff --git a/Resources/Private/Templates/Event/Teaser.html b/Resources/Private/Templates/Event/Teaser.html
index b0019bb..396e6d9 100644
--- a/Resources/Private/Templates/Event/Teaser.html
+++ b/Resources/Private/Templates/Event/Teaser.html
@@ -6,10 +6,10 @@
         <f:for each="{events}" as="event">
             <div class="col-sm-12 col-md-6 col-lg-4 col-xl-4">
                 <div class="menu-tile">
-                    <f:if condition="{event.images}">
+                    <f:if condition="{event.images.0}">
                         <f:then>
                             <f:link.action pageUid="{settings.showPID}" action="show" controller="Event" arguments="{event: event}">
-                                <f:image src="{event.images.originalResource.originalFile.uid}" alt="{date.event.title}" title="{date.event.title}" width="480c" height="320c" class="img-fluid img-thumbnail"/>
+                                <f:image image="{event.images.0}" alt="{date.event.title}" title="{date.event.title}" width="480c" height="320c" class="img-fluid img-thumbnail"/>
                             </f:link.action>
                         </f:then>
                         <f:else>
@@ -30,4 +30,4 @@
         </f:for>
     </div>
 </f:section>
-</html>
\ No newline at end of file
+</html>