MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [API] Fix fetching events by org UUID

pull/7842/head
Jakub Onderka 2021-10-15 10:42:38 +02:00
parent 035939ba99
commit 41f2825257
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controller/EventsController.php
View File

@ -385,14 +385,13 @@ class EventsController extends AppController
$this->Event->Org->virtualFields = [
'upper_name' => 'UPPER(name)',
'lower_uuid' => 'LOWER(name)',
'lower_uuid' => 'LOWER(uuid)',
];
$orgs = array_column($this->Event->Org->find('all', [
'fields' => ['Org.id', 'Org.upper_name', 'Org.lower_uuid'],
'recursive' => -1,
]), 'Org');
unset($this->Event->Org->virtualFields['upper_name']);
unset($this->Event->Org->virtualFields['lower_uuid']);
$this->Event->Org->virtualFields['upper_name'] = [];
$orgByName = array_column($orgs, null, 'upper_name');
$orgByUuid = array_column($orgs, null, 'lower_uuid');
// if the first character is '!', search for NOT LIKE the rest of the string (excluding the '!' itself of course)

1
app/Model/Event.php
View File

@ -17,6 +17,7 @@ App::uses('SendEmailTemplate', 'Tools');
* @property SharingGroup $SharingGroup
* @property ThreatLevel $ThreatLevel
* @property Sighting $Sighting
* @property Organisation $Org
*/
class Event extends AppModel
{