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

Previous commit fixed

pull/195/head
iglocska 2013-09-10 10:48:29 +02:00
parent 14d283bda4
commit 494827e76d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controller/EventsController.php
View File

@ -292,15 +292,12 @@ class EventsController extends AppController {
$temp = 0;
$pivot['children'] = array_values($pivot['children']);
foreach ($pivot['children'] as $k => $v) {
$temp2 = 0;
if($pivot['id'] == 49) debug($max);
$pivot['children'][$k]['height'] = ($temp+$k)*50;
$temp += $this->__arrangePivotVertical($pivot['children'][$k]);
if ($k > 0) {
$temp2 = (($pivot['children'][$k]['height'] - $pivot['children'][$k-1]['height'])/50) -1;
}
if (($temp+$temp2) > $max) $max = ($temp+$temp2);
if ($k == $max) $temp = $pivot['children'][$k]['height'] / 50;
}
return $max;
return $temp;
}
public function removePivot($id, $eventId, $self = false) {