From 7c5afc267ce29260e88c1714b63bcf71348fc763 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 13 Jan 2020 16:10:02 +0100
Subject: [PATCH] FEAT #12091 TIME 0:15 moved default in signatory book
---
src/app/attachment/controllers/AttachmentController.php | 5 -----
src/app/resource/controllers/StoreController.php | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php
index 3a514b1cea4..5c0b5716257 100755
--- a/src/app/attachment/controllers/AttachmentController.php
+++ b/src/app/attachment/controllers/AttachmentController.php
@@ -57,11 +57,6 @@ class AttachmentController
'collId' => 'attachments_coll'
]);
- $attachmentsTypes = AttachmentModel::getAttachmentsTypesByXML();
- if ($attachmentsTypes[$body['type']]['sign']) {
- AttachmentModel::setInSignatureBook(['id' => $id, 'inSignatureBook' => true]);
- }
-
$customId = CoreConfigModel::getCustomId();
$customId = empty($customId) ? 'null' : $customId;
exec("php src/app/convert/scripts/FullTextScript.php --customId {$customId} --resId {$id} --collId attachments_coll --userId {$GLOBALS['id']} > /dev/null &");
diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php
index 2583e1249c0..669fbc75468 100755
--- a/src/app/resource/controllers/StoreController.php
+++ b/src/app/resource/controllers/StoreController.php
@@ -309,7 +309,7 @@ class StoreController
'recipient_type' => $args['recipientType'] ?? null,
'validation_date' => $args['validationDate'] ?? null,
'effective_date' => $args['effectiveDate'] ?? null,
- 'in_signature_book' => empty($args['inSignatureBook']) ? 'false' : 'true',
+ 'in_signature_book' => $attachmentsTypes[$args['type']]['sign'] == true || !empty($args['inSignatureBook']) ? 'true' : 'false',
'external_id' => $externalId,
'creation_date' => 'CURRENT_TIMESTAMP'
];
--
GitLab