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

Merge branch 'hotfix-2.1.22'

pull/195/head
iglocska 2013-09-12 16:55:18 +02:00
parent 1aaf353822 44b714eb01
commit 6b3fcb6e23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Controller/EventsController.php
View File

@ -33,7 +33,7 @@ class EventsController extends AppController {
),
);
public $helpers = array('Js' => array('Jquery'), 'Pivot');
public $helpers = array('Js' => array('Jquery'));
public function beforeFilter() {
parent::beforeFilter();
@ -233,18 +233,20 @@ class EventsController extends AppController {
// tooltip for analysis
$this->set('analysisDescriptions', $this->Event->analysisDescriptions);
$this->set('analysisLevels', $this->Event->analysisLevels);
if ($continue) {
$data = $this->__continuePivoting($result['Event']['id'], $result['Event']['info'], $result['Event']['date'], $fromEvent);
} else {
$data = $this->__startPivoting($result['Event']['id'], $result['Event']['info'], $result['Event']['date']);
if (!$this->_isRest()) {
$this->helpers[] = 'Pivot';
if ($continue) {
$data = $this->__continuePivoting($result['Event']['id'], $result['Event']['info'], $result['Event']['date'], $fromEvent);
} else {
$data = $this->__startPivoting($result['Event']['id'], $result['Event']['info'], $result['Event']['date']);
}
$this->set('allPivots', $this->Session->read('pivot_thread'));
$pivot = $this->Session->read('pivot_thread');
$this->__arrangePivotVertical($pivot);
$this->__setDeletable($pivot, $id, true);
$this->set('pivot', $pivot);
$this->set('currentEvent', $id);
}
$this->set('allPivots', $this->Session->read('pivot_thread'));
$pivot = $this->Session->read('pivot_thread');
$this->__arrangePivotVertical($pivot);
$this->__setDeletable($pivot, $id, true);
$this->set('pivot', $pivot);
$this->set('currentEvent', $id);
}
private function __startPivoting($id, $info, $date){