From 719e0dac0dd3a2d46e5ed1df782c5a9edf94f625 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 6 Feb 2020 11:17:32 +0100
Subject: [PATCH] FEAT #12346 TIME 0:20 get convert information
---
src/app/resource/controllers/ResController.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index ec54d54d48b..de527d0d0f9 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -445,11 +445,13 @@ class ResController extends ResourceControlController
$pdfVersions = [];
$signedVersions = [];
$noteVersions = [];
- $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['version', 'filename']]);
+ $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['version', 'filename', 'format']]);
if (empty($resource['filename'])) {
return $response->withJson(['DOC' => $docVersions, 'PDF' => $pdfVersions, 'SIGN' => $signedVersions, 'NOTE' => $noteVersions]);
}
+ $canConvert = ConvertPdfController::canConvert(['extension' => $resource['format']]);
+
$convertedDocuments = AdrModel::getDocuments([
'select' => ['type', 'version'],
'where' => ['res_id = ?', 'type in (?)'],
@@ -457,7 +459,7 @@ class ResController extends ResourceControlController
'orderBy' => ['version ASC']
]);
if (empty($convertedDocuments)) {
- return $response->withJson(['DOC' => [$resource['version']], 'PDF' => $pdfVersions, 'SIGN' => $signedVersions, 'NOTE' => $noteVersions]);
+ return $response->withJson(['DOC' => [$resource['version']], 'PDF' => $pdfVersions, 'SIGN' => $signedVersions, 'NOTE' => $noteVersions, 'convert' => $canConvert]);
}
foreach ($convertedDocuments as $convertedDocument) {
@@ -473,7 +475,7 @@ class ResController extends ResourceControlController
}
$docVersions[] = $resource['version'];
- return $response->withJson(['DOC' => $docVersions, 'PDF' => $pdfVersions, 'SIGN' => $signedVersions, 'NOTE' => $noteVersions]);
+ return $response->withJson(['DOC' => $docVersions, 'PDF' => $pdfVersions, 'SIGN' => $signedVersions, 'NOTE' => $noteVersions, 'convert' => $canConvert]);
}
public function getVersionFileContent(Request $request, Response $response, array $args)
--
GitLab