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

- Update dl picture

Browse source
This commit is contained in:
Vincent BRIDIER 2020-05-19 15:30:35 +02:00
parent c8feebe8bc
commit da24396072
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/MediaController.php
View file

@ -1175,6 +1175,8 @@ class MediaController extends Controller
$media = Media::where('id', $mediasId)->first();
if ($media) {
$fp = $this->get_mediaPath($media, $format);
if (!file_exists($fp))
abort(404, 'Fichier inconnu.');
}
} else {
// create zip archive
@ -1187,6 +1189,11 @@ class MediaController extends Controller
$media = Media::where('id', $mediaId)->first();
if ($media) {
$fp = $this->get_mediaPath($media, $format);
if (!file_exists($fp)) {
$zip->close();
unlink($zip_file);
abort(404, 'Fichier(s) inconnu(s).');
}
$zip->addFile($fp, basename($fp));
}
}

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

@ -270,7 +270,7 @@
<script src="{{ asset('js/uploadfile/vendor/jquery.ui.widget.js') }}"></script>
<script src="{{ asset('js/uploadfile/jquery.iframe-transport.js') }}"></script>
@if (Auth::check() && Auth::user()->role != 2)
<!-- Fix à revoir -->
<!-- TODO : Fix à revoir -->
<script src="{{ asset('js/uploadfile/jquery.fileupload.js') }}"></script>
@endif
<script src="{{ asset('js/fabric.js') }}"></script>