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

fix: History is now available via the API, fixes #2111

pull/2128/head
iglocska 2017-04-05 13:29:51 +02:00
parent b3cfca18c7
commit 2f824e3833
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controller/LogsController.php
View File

@ -118,14 +118,22 @@ class LogsController extends AppController {
'conditions' => array('User.org_id' => $this->Auth->user('org_id')),
'fields' => array('User.id', 'User.email')
));
foreach ($list as &$item) {
if (!in_array($item['Log']['email'], $emails)) $item['Log']['email'] = '';
foreach ($list as $k => $item) {
if (!in_array($item['Log']['email'], $emails)) $list[$k]['Log']['email'] = '';
}
}
$this->set('event', $this->Event->data);
$this->set('list', $list);
$this->set('eventId', $id);
$this->set('mayModify', $mayModify);
if ($this->_isRest()) {
foreach ($list as $k => $item) {
$list[$k] = $item['Log'];
}
$list = array('Log' => $list);
return $this->RestResponse->viewData($list, $this->response->type());
} else {
$this->set('event', $this->Event->data);
$this->set('list', $list);
$this->set('eventId', $id);
$this->set('mayModify', $mayModify);
}
}
public $helpers = array('Js' => array('Jquery'), 'Highlight');