From b69878a543e9da9acc60041d4c406e18d60c59bc Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Thu, 7 May 2020 16:03:32 +0200
Subject: [PATCH] - Fix copyclipboard dossier_id null - Add DAM ID
 ArcadiaLink.php

---
 app/Http/Traits/ArcadiaLink.php         | 6 +++---
 resources/views/media_manager.blade.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Traits/ArcadiaLink.php b/app/Http/Traits/ArcadiaLink.php
index e7a4b4c..fa44441 100644
--- a/app/Http/Traits/ArcadiaLink.php
+++ b/app/Http/Traits/ArcadiaLink.php
@@ -72,13 +72,13 @@ trait ArcadiaLink  {
     {
         $uid = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0x0fff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000, mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
         Storage::disk('arcadia_link_s')->put("$uid.xml", $xml);
-        self::compress($media->folder, $media->uid, $media->extension, $uid);
+        self::compress($media->folder, $media->uid, $media->extension, $uid, $media->id);
     }
 
-    private static function compress($folder, $name, $extension, $uid)
+    private static function compress($folder, $name, $extension, $uid, $media_id)
     {
         try {
-            $zip_file = storage_path('arcadia_link/send') ."/$uid.zip";
+            $zip_file = storage_path('arcadia_link/send') ."/$media_id-$uid.zip";
             $zip = new \ZipArchive();
             $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
             $zip->addFile(storage_path('arcadia_link/send') . "/$uid.xml", 'media.xml');
diff --git a/resources/views/media_manager.blade.php b/resources/views/media_manager.blade.php
index 4066339..09d1888 100644
--- a/resources/views/media_manager.blade.php
+++ b/resources/views/media_manager.blade.php
@@ -261,7 +261,7 @@
                     depot: {{session('autoOpen')['depot']}},
                     typemedia: {{session('autoOpen')['typemedia']}},
                     ext: "{{session('autoOpen')['ext']}}",
-                    dossier_id: {{session('autoOpen')['dossier_id']}}
+                    dossier_id: @if (session('autoOpen')['dossier_id']){{session('autoOpen')['dossier_id']}}@else null @endif
                 }, null, null);
             });
         </script>