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

chg: [UI] Sort orgs by name in statistics

pull/7712/head
Jakub Onderka 2021-09-01 11:01:39 +02:00
parent c1aa6d51e8
commit af8ecbf5a2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/UsersController.php
View File

@ -1873,7 +1873,8 @@ class UsersController extends AppController
$params = array(
'fields' => array('id', 'name'),
'recursive' => -1,
'conditions' => array()
'conditions' => array(),
'order' => ['name'],
);
if (!$this->_isSiteAdmin() && !empty(Configure::read('Security.hide_organisation_index_from_users'))) {
$params['conditions'] = array('Organisation.id' => $this->Auth->user('org_id'));

2
app/Model/AuditLog.php
View File

@ -358,7 +358,7 @@ class AuditLog extends AppModel
$validDates = $this->query($sql);
}
$data = [];
foreach ($validDates as $k => $date) {
foreach ($validDates as $date) {
$data[(int)$date[0]['Date']] = (int)$date[0]['count'];
}
return $data;