From f6fef90b7c941b9e4bfe3d0c06ede71937aad010 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 19 Jan 2021 16:28:09 +0100
Subject: [PATCH] FEAT #10240 TIME 4:00 Fix mailing + send mailing unique id to
MP
---
src/app/attachment/controllers/AttachmentController.php | 5 -----
.../controllers/MaarchParapheurController.php | 7 ++++++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php
index a628f493f75..f78783efa47 100755
--- a/src/app/attachment/controllers/AttachmentController.php
+++ b/src/app/attachment/controllers/AttachmentController.php
@@ -941,11 +941,6 @@ class AttachmentController
if (!empty($id['errors'])) {
return ['errors' => $id['errors']];
}
- $customId = CoreConfigModel::getCustomId();
- $customId = empty($customId) ? 'null' : $customId;
- $coreUrl = str_replace('rest/', '', UrlController::getCoreUrl());
-
- exec("php src/app/convert/scripts/ConvertPdfScript.php --customId {$customId} --resId {$id} --type attachment --userId {$GLOBALS['id']} --coreUrl {$coreUrl} > /dev/null &");
}
}
diff --git a/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php b/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php
index 922047f85ec..6933ab4986b 100755
--- a/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php
+++ b/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php
@@ -286,6 +286,7 @@ class MaarchParapheurController
unset($attachments[$key]);
}
}
+ $mailingIds = [];
foreach ($attachments as $value) {
$resId = $value['res_id'];
$collId = 'attachments_coll';
@@ -342,6 +343,9 @@ class MaarchParapheurController
$workflow = [];
foreach ($aArgs['steps'] as $step) {
if (!$step['mainDocument'] && ($step['resId'] == $resId || (!empty($value['mailingResId']) && $step['resId'] == $value['mailingResId']))) {
+ if (!empty($value['mailingResId']) && empty($mailingIds[$value['mailingResId']])) {
+ $mailingIds[$value['mailingResId']] = CoreConfigModel::uniqueId();
+ }
$signaturePositions = null;
if (!empty($step['signaturePositions']) && is_array($step['signaturePositions'])) {
$valid = true;
@@ -380,7 +384,8 @@ class MaarchParapheurController
'deadline' => $processLimitDate,
'attachments' => $attachmentsData,
'workflow' => $workflow,
- 'metadata' => $metadata
+ 'metadata' => $metadata,
+ 'mailingId' => empty($value['mailingResId']) ? null : $mailingIds[$value['mailingResId']]
];
if (!empty($aArgs['note'])) {
$noteCreationDate = new \DateTime();
--
GitLab