From 0f09ef2f3765fec6dddf267ce86232c3b0c4e1be Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 6 Mar 2020 18:28:08 +0100
Subject: [PATCH] fix #3480 @0:10

---
 .../Admin/Operations/DownloadOperation.php    |  6 ++++--
 composer.lock                                 | 20 +++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Admin/Operations/DownloadOperation.php b/app/Http/Controllers/Admin/Operations/DownloadOperation.php
index f8615875a..c55612c8f 100644
--- a/app/Http/Controllers/Admin/Operations/DownloadOperation.php
+++ b/app/Http/Controllers/Admin/Operations/DownloadOperation.php
@@ -2,10 +2,11 @@
 
 namespace App\Http\Controllers\Admin\Operations;
 
+use App\Models\QuizTranslation;
 use Cubist\Util\Files\Files;
 use Cubist\Util\Zip;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Str;
+use Cubist\Util\Str;
 
 trait DownloadOperation
 {
@@ -25,7 +26,8 @@ trait DownloadOperation
         $entry = $this->crud->getEntry($id);
         $entry->compile($compilepath);
 
-        $fname = Str::slug($id . ' ' . $entry->getAttribute('title')) . '.zip';
+        $translation = QuizTranslation::find($entry->getAttribute('translation'));
+        $fname = Str::slugCase($entry->getAttribute('client') . ' ' . $entry->getAttribute('project') . ' ' . date_format($entry->getAttribute('updated_at'), 'Ymd') . ' ' . $translation->locale . ' ' . $id) . '.zip';
         $dest = protected_path('quiz/download/' . $fname);
 
         Zip::archive($compilepath, $dest);
diff --git a/composer.lock b/composer.lock
index 907f3e865..856bf2274 100644
--- a/composer.lock
+++ b/composer.lock
@@ -920,13 +920,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "0ebab60a4cf0464f46226d118538c892955bf785"
+                "reference": "9d60ca8b2738cf3c162ac8139e34ba901ed94ece"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-c05cd0.tar",
-                "reference": "0ebab60a4cf0464f46226d118538c892955bf785",
-                "shasum": "1f70525f7ab8ada118bd6b46135dc2a123005588"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-f6ee24.tar",
+                "reference": "9d60ca8b2738cf3c162ac8139e34ba901ed94ece",
+                "shasum": "a16033e3ebbe0bcfca68660ae4cfd2f168b52139"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -997,7 +997,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-03-05T17:17:26+00:00"
+            "time": "2020-03-06T17:12:43+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -1245,13 +1245,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "d6969d9f389e215d2b042e420d8fb7372028b808"
+                "reference": "7a797893b34b595b7056e9b3a7542e092cecc62f"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-5892da.tar",
-                "reference": "d6969d9f389e215d2b042e420d8fb7372028b808",
-                "shasum": "39216acabf0de43584e1fff02548df0b43aa05b8"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-1aad8b.tar",
+                "reference": "7a797893b34b595b7056e9b3a7542e092cecc62f",
+                "shasum": "5a7b806fb9d680ee125964ae25ce08a70c6045a4"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -1280,7 +1280,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2020-03-06T14:14:31+00:00"
+            "time": "2020-03-06T17:21:50+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",
-- 
2.39.5