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

fix: [user:periodic_notification] Perform filtering on event tags only for aggregated context 

This is for restSearch to stay consistent with how events are fetched by the default fetcher
pull/8575/head
Sami Mokaddem 2022-08-31 14:54:27 +02:00
parent 406cda070e
commit f23e582760
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/User.php
View File

@ -1755,6 +1755,10 @@ class User extends AppModel
$filtersForRestSearch['returnFormat'] = 'context';
$filtersForRestSearch['staticHtml'] = true;
unset($filtersForRestSearch['last']);
if (!empty($filtersForRestSearch['tags'])) {
$filtersForRestSearch['event_tags'] = $filtersForRestSearch['tags'];
unset($filtersForRestSearch['tags']);
}
$final = $this->Event->restSearch($user, 'context', $filtersForRestSearch, false, false, $elementCounter, $renderView);
$final = json_decode($final->intoString(), true);
$aggregated_context = $this->__renderAggregatedContext($final);

2
app/View/Users/notification_settings.ctp
View File

@ -56,7 +56,7 @@ echo $this->element('genericElements/Form/genericForm', [
],
[
'field' => 'periodic_settings.tags',
'label' => __('Tag list'),
'label' => __('Event Tags'),
'type' => 'tagsPicker',
'placeholder' => '["tlp:red"]',
],