From ad53221616a17a2a4879defd18ebcb8dc0e7a487 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 31 Jan 2020 17:42:13 +0100
Subject: [PATCH] FEAT #12346 TIME 0:30 continue test batch process mail from
signatory book
---
modules/visa/batch/process_mailsFromSignatoryBook.php | 2 +-
src/app/resource/controllers/ResourceControlController.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/visa/batch/process_mailsFromSignatoryBook.php b/modules/visa/batch/process_mailsFromSignatoryBook.php
index 7045ed50b31..d6eea3bdf3d 100755
--- a/modules/visa/batch/process_mailsFromSignatoryBook.php
+++ b/modules/visa/batch/process_mailsFromSignatoryBook.php
@@ -320,7 +320,7 @@ foreach ($retrievedMails['noVersion'] as $resId => $value) {
'format' => $value->format,
'attachment_type' => $value->attachment_type,
'in_signature_book' => 'true',
- 'originId' => $resId,
+ 'origin_id' => $resId,
'status' => 'SIGN',
'encodedFile' => $value->encodedFile,
'noteContent' => $value->noteContent,
diff --git a/src/app/resource/controllers/ResourceControlController.php b/src/app/resource/controllers/ResourceControlController.php
index 41b317946e1..14011286e00 100644
--- a/src/app/resource/controllers/ResourceControlController.php
+++ b/src/app/resource/controllers/ResourceControlController.php
@@ -123,7 +123,7 @@ class ResourceControlController
return ['errors' => 'Body is not set or empty'];
}
- $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['status', 'model_id', 'external_signatory_book_id', 'format']]);
+ $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['status', 'model_id', 'format', 'external_id->>\'signatureBookId\' as signaturebookid']]);
if (empty($resource['status'])) {
return ['errors' => 'Resource status is empty. It can not be modified'];
}
@@ -135,7 +135,7 @@ class ResourceControlController
if ($args['onlyDocument'] && empty($body['encodedFile'])) {
return ['errors' => 'Body encodedFile is not set or empty'];
} elseif (!empty($body['encodedFile'])) {
- if (!empty($resource['external_signatory_book_id'])) {
+ if (!empty($resource['signaturebookid'])) {
return ['errors' => 'Resource is in external signature book, file can not be modified'];
} elseif (ResourceControlController::isSigned(['resId' => $args['resId']])) {
return ['errors' => 'Resource is signed, file can not be modified'];
--
GitLab