From 78858e84f288278bc93e730f368e1c7d5b7505ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 9 Mar 2023 18:01:39 +0100 Subject: [PATCH] Fixed: force a name when downloading a document without filename see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/1005 --- .../Resources/views/Activity/_list_item.html.twig | 2 +- .../Resources/views/Activity/show.html.twig | 2 +- .../public/vuejs/StoredObjectButton/DownloadButton.vue | 10 ++++------ .../ChillDocStoreBundle/translations/messages.fr.yml | 5 ++++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig index f2430c200..885125aa6 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig @@ -166,7 +166,7 @@
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig index b7a9d7239..acda43b97 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig @@ -170,7 +170,7 @@ {% if entity.documents|length > 0 %} {% else %} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue index ca6a0f618..f05d1e91c 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue +++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue @@ -38,13 +38,11 @@ async function download_and_open(event: Event): Promise { button.href = window.URL.createObjectURL(raw); button.type = props.storedObject.type; - if (props.filename !== undefined) { - button.download = props.filename || 'document'; + button.download = props.filename || 'document'; - const ext = mime.getExtension(props.storedObject.type); - if (null !== ext) { - button.download = button.download + '.' + ext; - } + const ext = mime.getExtension(props.storedObject.type); + if (null !== ext) { + button.download = button.download + '.' + ext; } } diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml index b658dbbee..1d06c58e4 100644 --- a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml @@ -19,6 +19,9 @@ The document is successfully registered: Le document est enregistré The document is successfully updated: Le document est mis à jour Any description: Aucune description +document: + Any title: Aucun titre + # delete Delete document ?: Supprimer le document ? Are you sure you want to remove this document ?: Êtes-vous sûr·e de vouloir supprimer ce document ? @@ -73,4 +76,4 @@ CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE: Créer un document CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE: Supprimer un document CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE: Voir les documents CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS: Voir les détails d'un document -CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE: Modifier un document \ No newline at end of file +CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE: Modifier un document