From 47e55d5ee71189003b60c4b03d45086a03c38deb Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 13 Feb 2020 00:02:11 +0100
Subject: [PATCH] FEAT #12345 TIME 0:15 return mailing errors in array
---
src/app/action/controllers/ActionMethodController.php | 4 ++--
src/app/action/controllers/ExternalSignatoryBookTrait.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/action/controllers/ActionMethodController.php b/src/app/action/controllers/ActionMethodController.php
index 48bd35f7dbe..1af85c6bd09 100644
--- a/src/app/action/controllers/ActionMethodController.php
+++ b/src/app/action/controllers/ActionMethodController.php
@@ -347,7 +347,7 @@ class ActionMethodController
if ($attachment['status'] == 'SEND_MASS') {
$generated = AttachmentController::generateMailing(['id' => $attachment['res_id'], 'userId' => $GLOBALS['id']]);
if (!empty($generated['errors'])) {
- return ['errors' => $generated['errors']];
+ return ['errors' => [$generated['errors']]];
}
}
}
@@ -397,7 +397,7 @@ class ActionMethodController
foreach ($attachments as $attachment) {
$generated = AttachmentController::generateMailing(['id' => $attachment['res_id'], 'userId' => $GLOBALS['id']]);
if (!empty($generated['errors'])) {
- return ['errors' => $generated['errors']];
+ return ['errors' => [$generated['errors']]];
}
}
}
diff --git a/src/app/action/controllers/ExternalSignatoryBookTrait.php b/src/app/action/controllers/ExternalSignatoryBookTrait.php
index b51716950d4..6ddfd985780 100644
--- a/src/app/action/controllers/ExternalSignatoryBookTrait.php
+++ b/src/app/action/controllers/ExternalSignatoryBookTrait.php
@@ -52,7 +52,7 @@ trait ExternalSignatoryBookTrait
if ($attachment['status'] == 'SEND_MASS') {
$generated = AttachmentController::generateMailing(['id' => $attachment['res_id'], 'userId' => $GLOBALS['id']]);
if (!empty($generated['errors'])) {
- return ['errors' => $generated['errors']];
+ return ['errors' => [$generated['errors']]];
}
}
}
--
GitLab