From c9e0326d4ed9aefe7e3af9deb04d14370515fb87 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 16:35:20 +0100
Subject: [PATCH] fix: [event] Includes eventReport when using the `merge from`
 feature

---
 app/Controller/EventsController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 7a1c167a9..061ce3568 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -2198,18 +2198,22 @@ class EventsController extends AppController
             $results = [
                 'results' => [
                     'Object' => $source_event[0]['Object'],
-                    'Attribute' => $source_event[0]['Attribute']
+                    'Attribute' => $source_event[0]['Attribute'],
+                    'EventReport' => $source_event[0]['EventReport']
                 ]
             ];
             if ($this->_isRest()) {
                 $this->loadModel('Log');
-                $save_results = ['attributes' => 0, 'objects' => 0];
+                $save_results = ['attributes' => 0, 'objects' => 0, 'eventReports' => 0];
                 foreach ($results['results']['Attribute'] as $attribute) {
                     $this->Event->Attribute->captureAttribute($attribute, $target_id, $this->Auth->user(), false, $this->Log);
                 }
                 foreach ($results['results']['Object'] as $object) {
                     $this->Event->Object->captureObject($object, $target_id, $this->Auth->user(), $this->Log);
                 }
+                foreach ($results['results']['EventReport'] as $report) {
+                    $this->Event->EventReport->captureReport($this->Auth->user(), $report, $target_id);
+                }
                 $event = $this->Event->fetchEvent(
                     $this->Auth->user(),
                     [