From 58ccc1059ad18820fec3d96d51fe3fc84225566a Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Mon, 19 Oct 2020 17:00:23 +0200
Subject: [PATCH] #1541 Fix alert merge into case process to use API v1
 attributes

---
 frontend/app/scripts/controllers/alert/AlertEventCtrl.js | 2 +-
 frontend/app/scripts/controllers/alert/AlertListCtrl.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/app/scripts/controllers/alert/AlertEventCtrl.js b/frontend/app/scripts/controllers/alert/AlertEventCtrl.js
index 0882b3ac47..2a03738846 100644
--- a/frontend/app/scripts/controllers/alert/AlertEventCtrl.js
+++ b/frontend/app/scripts/controllers/alert/AlertEventCtrl.js
@@ -132,7 +132,7 @@
                 });
 
                 caseModal.result.then(function(selectedCase) {
-                    self.mergeIntoCase(selectedCase.id);
+                    self.mergeIntoCase(selectedCase._id);
                 }).catch(function(err) {
                     if(err && !_.isString(err)) {
                         NotificationSrv.error('AlertEventCtrl', err.data, err.status);
diff --git a/frontend/app/scripts/controllers/alert/AlertListCtrl.js b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
index b21bdb7a05..8c7d322cf2 100755
--- a/frontend/app/scripts/controllers/alert/AlertListCtrl.js
+++ b/frontend/app/scripts/controllers/alert/AlertListCtrl.js
@@ -381,7 +381,7 @@
                 });
 
                 caseModal.result.then(function(selectedCase) {
-                    return AlertingSrv.bulkMergeInto(_.pluck(self.selection, '_id'), selectedCase.id);
+                    return AlertingSrv.bulkMergeInto(_.pluck(self.selection, '_id'), selectedCase._id);
                 })
                 .then(function(response) {
                     $rootScope.$broadcast('alert:event-imported');