From 8e9c89f7f0d611aaab26565cbc8f1d1997bfb59f Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 19 Oct 2020 17:32:04 +0200
Subject: [PATCH] FEAT #5241 TIME 0:10 update qr code format
---
src/app/contentManagement/controllers/MergeController.php | 2 +-
src/app/resource/controllers/ResController.php | 1 +
src/app/resource/controllers/StoreController.php | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index 46474e562fa..80800b6a593 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -397,7 +397,7 @@ class MergeController
$data = [
'chrono' => $prefix . $args['chrono'],
'resIdMaster' => $args['resIdMaster'],
- 'originId' => $args['originId'],
+ 'resId' => $args['resId'],
'title' => $args['title']
];
$data = json_encode($data);
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 110d6a5c940..25bf2730ff8 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -1365,6 +1365,7 @@ class ResController extends ResourceControlController
$docserver = DocserverModel::getByDocserverId(['docserverId' => $resource['docserver_id'], 'select' => ['path_template']]);
$resource['docserverPathFile'] = $docserver['path_template'] . $resource['path'];
$resource['docserverPathFile'] = str_replace('//', '/', $resource['docserverPathFile']);
+ $resource['docserverPathFile'] = str_replace('#', '/', $resource['docserverPathFile']);
}
$resource['creationDate'] = $resource['creation_date'];
diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php
index 9daaf2aff82..9ce2ac77e2a 100755
--- a/src/app/resource/controllers/StoreController.php
+++ b/src/app/resource/controllers/StoreController.php
@@ -53,7 +53,7 @@ class StoreController
$uniqueId = CoreConfigModel::uniqueId();
$tmpFilename = "storeTmp_{$GLOBALS['id']}_{$uniqueId}.{$args['format']}";
file_put_contents($tmpPath . $tmpFilename, $fileContent);
- $fileContent = MergeController::mergeChronoDocument(['chrono' => $data['alt_identifier'], 'path' => $tmpPath . $tmpFilename, 'type' => 'resource', 'resIdMaster' => $resId, 'originId' => null, 'title' => $data['subject']]);
+ $fileContent = MergeController::mergeChronoDocument(['chrono' => $data['alt_identifier'], 'path' => $tmpPath . $tmpFilename, 'type' => 'resource', 'resIdMaster' => $resId, 'resId' => null, 'title' => $data['subject']]);
$fileContent = base64_decode($fileContent['encodedDocument']);
unlink($tmpPath . $tmpFilename);
}
@@ -109,7 +109,7 @@ class StoreController
$uniqueId = CoreConfigModel::uniqueId();
$tmpFilename = "storeTmp_{$GLOBALS['id']}_{$uniqueId}.{$args['format']}";
file_put_contents($tmpPath . $tmpFilename, $fileContent);
- $fileContent = MergeController::mergeChronoDocument(['chrono' => $data['identifier'], 'path' => $tmpPath . $tmpFilename, 'type' => 'attachment', 'resIdMaster' => $data['res_id_master'], 'originId' => $resId, 'title' => $data['title']]);
+ $fileContent = MergeController::mergeChronoDocument(['chrono' => $data['identifier'], 'path' => $tmpPath . $tmpFilename, 'type' => 'attachment', 'resIdMaster' => $data['res_id_master'], 'resId' => $resId, 'title' => $data['title']]);
$fileContent = base64_decode($fileContent['encodedDocument']);
unlink($tmpPath . $tmpFilename);
}
--
GitLab