From 4b105c6f574565def691648cef4a6ef800530881 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Thu, 15 Oct 2020 17:51:46 +0200
Subject: [PATCH] FEAT #14383 TIME 0:25 added more information about resource
document file
---
src/app/resource/controllers/ResController.php | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index a004d503cc5..6d121c906b2 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -39,7 +39,6 @@ use MessageExchange\models\MessageExchangeModel;
use Note\models\NoteModel;
use Priority\models\PriorityModel;
use RegisteredMail\controllers\RegisteredMailController;
-use RegisteredMail\models\IssuingSiteModel;
use RegisteredMail\models\RegisteredMailModel;
use Resource\models\ResModel;
use Resource\models\ResourceContactModel;
@@ -1359,9 +1358,17 @@ class ResController extends ResourceControlController
$resource = ResModel::getById([
'resId' => $args['resId'],
- 'select' => ['format', 'fingerprint', 'filesize', 'fulltext_result']
+ 'select' => ['format', 'fingerprint', 'filesize', 'fulltext_result', 'creation_date', 'filename', 'docserver_id', 'path']
]);
+ if (!empty($resource['docserver_id'])) {
+ $docserver = DocserverModel::getByDocserverId(['docserverId' => $resource['docserver_id'], 'select' => ['path_template']]);
+ $resource['docserverPathFile'] = $resource['path'] . $docserver['path_template'] . $resource['filename'];
+ }
+
+ $resource['creationDate'] = $resource['creation_date'];
+ unset($resource['creation_date']);
+
$allowedFiles = StoreController::getAllowedFiles();
$allowedFiles = array_column($allowedFiles, 'canConvert', 'extension');
--
GitLab