forge-joniko/ldc-dam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Fix copyclipboard dossier_id null

Browse source 
- Add DAM ID ArcadiaLink.php
This commit is contained in:
Vincent BRIDIER 2020-05-07 16:03:32 +02:00
parent 421154adca
commit b69878a543
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Traits/ArcadiaLink.php
View file

@ -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');

2
resources/views/media_manager.blade.php
View file

@ -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>