From 52021ee0c973bd8db134af6ff77950f74b83785a Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Mon, 28 Oct 2019 18:27:29 +0100
Subject: [PATCH] FIX #11982 TIME 0:20 migrate sql m2m
---
migration/19.12/1912.sql | 4 ++--
.../Controllers/MessageExchangeReviewController.php | 6 +++++-
src/app/action/controllers/ActionMethodController.php | 3 +--
.../controllers/MessageExchangeReviewController.php | 6 +++++-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql
index 57f65c9a624..01ed2c24894 100644
--- a/migration/19.12/1912.sql
+++ b/migration/19.12/1912.sql
@@ -479,8 +479,8 @@ ALTER TABLE listinstance_history_details DROP COLUMN IF EXISTS added_by_entity;
ALTER TABLE usergroup_content DROP COLUMN IF EXISTS primary_group;
/* M2M */
-UPDATE res_letterbox SET external_id = json_build_object('m2m', reference_number) FROM mlb_coll_ext WHERE res_letterbox.res_id = mlb_coll_ext.res_id AND mlb_coll_ext.nature_id = 'message_exchange';
-UPDATE mlb SET nature_id = null, reference_number = null WHERE nature_id = 'message_exchange';
+UPDATE res_letterbox SET external_id = json_build_object('m2m', reference_number), reference_number = null FROM mlb_coll_ext WHERE res_letterbox.res_id = mlb_coll_ext.res_id AND mlb_coll_ext.nature_id = 'message_exchange';
+UPDATE mlb_coll_ext SET nature_id = null WHERE nature_id = 'message_exchange';
/* RE CREATE VIEWS */
CREATE VIEW res_view_attachments AS
diff --git a/modules/sendmail/Controllers/MessageExchangeReviewController.php b/modules/sendmail/Controllers/MessageExchangeReviewController.php
index b9e246c6f86..d3c1f762993 100755
--- a/modules/sendmail/Controllers/MessageExchangeReviewController.php
+++ b/modules/sendmail/Controllers/MessageExchangeReviewController.php
@@ -42,7 +42,11 @@ class MessageExchangeReviewController
if (!empty($resLetterboxData[0]['external_id'])) {
$resLetterboxData[0]['external_id'] = json_decode($resLetterboxData[0]['external_id'], true);
- return $resLetterboxData[0];
+ if (!empty($resLetterboxData[0]['external_id']['m2m'])) {
+ return $resLetterboxData[0];
+ } else {
+ return false;
+ }
} else {
return false;
}
diff --git a/src/app/action/controllers/ActionMethodController.php b/src/app/action/controllers/ActionMethodController.php
index 80b8f3b3e91..f03f8ebc8b6 100644
--- a/src/app/action/controllers/ActionMethodController.php
+++ b/src/app/action/controllers/ActionMethodController.php
@@ -91,8 +91,7 @@ class ActionMethodController
'info' => $info
]);
- //TODO M2M
-// MessageExchangeReviewController::sendMessageExchangeReview(['res_id' => $resource, 'action_id' => $aArgs['id'], 'userId' => $GLOBALS['userId']]);
+ MessageExchangeReviewController::sendMessageExchangeReview(['res_id' => $resource, 'action_id' => $aArgs['id'], 'userId' => $GLOBALS['userId']]);
}
}
diff --git a/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php b/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
index c8febf0f083..0a5ba2e834b 100755
--- a/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
+++ b/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
@@ -37,7 +37,11 @@ class MessageExchangeReviewController
if (!empty($resLetterboxData[0]['external_id'])) {
$resLetterboxData[0]['external_id'] = json_decode($resLetterboxData[0]['external_id'], true);
- return $resLetterboxData[0];
+ if (!empty($resLetterboxData[0]['external_id']['m2m'])) {
+ return $resLetterboxData[0];
+ } else {
+ return false;
+ }
} else {
return false;
}
--
GitLab