From ded0739f6419a828f45538b091ef11e2f5f5c8bc Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@users.noreply.github.com>
Date: Mon, 27 May 2024 17:58:09 +0200
Subject: [PATCH] Message: Check whether there is at least one attachment
 before showing the attachments section - refs BT#21594

---
 assets/vue/views/message/MessageShow.vue      | 53 ++++++++++---------
 .../default/message/view_message.html.twig    |  2 +-
 translations/messages.fr.po                   |  4 +-
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/assets/vue/views/message/MessageShow.vue b/assets/vue/views/message/MessageShow.vue
index 63dd0a0686..a9e598c094 100644
--- a/assets/vue/views/message/MessageShow.vue
+++ b/assets/vue/views/message/MessageShow.vue
@@ -104,36 +104,37 @@
 
     <div v-html="item.content" />
 
-    <BaseCard>
-      <template #header>
-        <p class="m-3">{{ item.attachments.length }} {{ $t("Attachments") }}</p>
-      </template>
-
-      <div
-        v-if="item.attachments && item.attachments.length > 0"
-        class="q-gutter-y-sm q-gutter-x-sm row"
-      >
+    <template v-if="item.attachments && item.attachments.length > 0">
+      <BaseCard>
+        <template #header>
+          <p class="m-3">{{ item.attachments.length }} {{ $t("Attachments") }}</p>
+        </template>
+
         <div
-          v-for="(attachment, index) in item.attachments"
-          :key="index"
+          class="q-gutter-y-sm q-gutter-x-sm row"
         >
-          <div v-if="attachment.resourceNode.resourceFile.audio">
-            <audio controls>
-              <source :src="attachment.downloadUrl" />
-            </audio>
-          </div>
-
-          <BaseButton
-            v-else
-            :href="attachment.downloadUrl"
-            icon="attachment"
-            type="primary"
+          <div
+            v-for="(attachment, index) in item.attachments"
+            :key="index"
           >
-            {{ attachment.resourceNode.resourceFile.originalName }}
-          </BaseButton>
+            <div v-if="attachment.resourceNode.resourceFile.audio">
+              <audio controls>
+                <source :src="attachment.downloadUrl" />
+              </audio>
+            </div>
+
+            <BaseButton
+              v-else
+              :href="attachment.downloadUrl"
+              icon="attachment"
+              type="primary"
+            >
+              {{ attachment.resourceNode.resourceFile.originalName }}
+            </BaseButton>
+          </div>
         </div>
-      </div>
-    </BaseCard>
+      </BaseCard>
+    </template>
     <Loading :visible="isLoading" />
   </div>
 </template>
diff --git a/public/main/template/default/message/view_message.html.twig b/public/main/template/default/message/view_message.html.twig
index 76d821bd60..39b6833792 100644
--- a/public/main/template/default/message/view_message.html.twig
+++ b/public/main/template/default/message/view_message.html.twig
@@ -40,7 +40,7 @@
                {{ message.content }}
             </div>
 
-            {% if message.attachments %}
+            {% if message.attachments.quantity > 0 %}
                 <div class="email-attachments">
                     <div class="title">{{ 'Attachments'|trans }} <span>({{ message.attachments.quantity }} {{ 'Files'|trans }}, {{ message.attachments.total_size }})</span></div>
                     <ul>
diff --git a/translations/messages.fr.po b/translations/messages.fr.po
index a223c721b3..f517a4ad6c 100644
--- a/translations/messages.fr.po
+++ b/translations/messages.fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: chamilo\n"
-"PO-Revision-Date: 2024-04-24 09:40+0000\n"
+"PO-Revision-Date: 2024-05-27 08:58+0000\n"
 "Last-Translator: Yannick Warnier <ywarnier@chamilo.org>\n"
 "Language-Team: French <https://translation.chamilo.org/projects/chamilo/"
 "messages/fr/>\n"
@@ -9026,7 +9026,7 @@ msgid "Add it"
 msgstr "Ajouter une ressource"
 
 msgid "Attachments"
-msgstr "Ressources ajoutées"
+msgstr "ressource(s) ajoutée(s)"
 
 msgid "Time report for teacher %s"
 msgstr "Rapport de temps pour l'enseignant %s"