hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3958_download-one-asset (#4425)

Browse Source 
* fix sync-download 1 doc ; fix stamp not removed

* remove test
This commit is contained in:
jygaulier
2023-11-30 15:15:34 +01:00
committed by GitHub
parent bfe3bd04f4
commit 00fc6e1c7a
4 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Alchemy/Phrasea/Controller/Prod/DownloadController.php
View File

@@ -17,6 +17,7 @@ use Alchemy\Phrasea\Core\Event\ExportEvent;
use Alchemy\Phrasea\Core\PhraseaEvents;
use Alchemy\Phrasea\Filesystem\PhraseanetFilesystem;
use Alchemy\Phrasea\Model\Manipulator\TokenManipulator;
use Exception;
use set_export;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -81,6 +82,7 @@ class DownloadController extends Controller
*
* @param Request $request
* @return Response
* @throws Exception
*/
public function listDownloadAsync(Request $request)
{
@@ -98,12 +100,6 @@ class DownloadController extends Controller
$this->app->abort(403);
}
// "stamp_choice" is a ckbox with value "NO_STAMP" to "remove stamp" on download
$stamp_method = set_export::STAMP_ASYNC; // will not stamp, but flag files to be stamped
if($request->request->get('stamp_choice') === set_export::NO_STAMP) {
$stamp_method = set_export::NO_STAMP;
}
$list = $download->prepare_export(
$this->getAuthenticatedUser(),
$this->getFilesystem(),
@@ -128,7 +124,7 @@ class DownloadController extends Controller
try {
$record = new \record_adapter($this->app, $sbasId, $file['record_id']);
} catch (\Exception $e) {
} catch (Exception $e) {
continue;
}
@@ -183,10 +179,10 @@ class DownloadController extends Controller
]);
}
else {
throw new \Exception("invalid or expired token");
throw new Exception("invalid or expired token");
}
}
catch(\Exception $e) {
catch(Exception $e) {
// no-op
$this->app->abort(403, $e->getMessage());
}