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

Merge branch '2.4' of github.com:MISP/MISP into develop

pull/9255/head
Sami Mokaddem 2023-08-11 08:55:52 +02:00
parent 0c327dcc6c 22e863fac3
commit 3a44d10168
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Lib/Dashboard/EventEvolutionLineWidget.php
View File

@ -92,7 +92,7 @@ class EventEvolutionLineWidget
'recursive' => -1,
'conditions' => $eparams['conditions'],
'fields' => ['DATE_FORMAT(FROM_UNIXTIME(Event.publish_timestamp), "%Y-%m") AS date', 'count(id) AS count'],
'group' => ['MONTH(FROM_UNIXTIME(Event.publish_timestamp)), YEAR(FROM_UNIXTIME(Event.publish_timestamp))', 'Event.publish_timestamp',]
'group' => ['MONTH(FROM_UNIXTIME(Event.publish_timestamp)), YEAR(FROM_UNIXTIME(Event.publish_timestamp))',]
]);

2
app/Lib/Dashboard/OrgEvolutionLineWidget.php
View File

@ -83,7 +83,7 @@ class OrgEvolutionLineWidget
'recursive' => -1,
'conditions' => $params['conditions'],
'fields' => ['DATE_FORMAT(date_created, "%Y-%m") AS date', 'count(id) AS count'],
'group' => ['MONTH(date_created), YEAR(date_created)', 'Organisation.date_created', ]
'group' => ['MONTH(date_created), YEAR(date_created)', ]
]);
usort($raw, [$this, 'sortByCreationDate']);

2
app/Lib/Dashboard/TrendingAttributesWidget.php
View File

@ -99,7 +99,7 @@ class TrendingAttributesWidget
$values = $attributeModel->find('all', [
'recursive' => -1,
'fields' => ['Attribute.value1', 'count(Attribute.value1) as Attribute__frequency'],
'group' => ['Attribute.value1', 'Event.orgc_id', 'Event.id',], // Multiple group for `only_full_group_by`
'group' => ['Attribute.value1', ],
'conditions' => $conditions,
'contain' => ['Event.orgc_id'],
'order' => 'count(Attribute.value1) desc',