tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

servicegrid: Properly handle `?flipped=0` 

refs #2640
This commit is contained in:
Johannes Meyer 2018-05-07 14:14:34 +02:00
parent 568d473c40
commit 9b76ff5539
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/scripts/joystickPagination.phtml
View File

@ -7,7 +7,7 @@ $xAxisPages = $xAxisPaginator->getPages('all');
$yAxisPages = $yAxisPaginator->getPages('all'); $yAxisPages = $yAxisPaginator->getPages('all');
$flipUrl = Url::fromRequest(); $flipUrl = Url::fromRequest();
if ($flipUrl->hasParam('flipped')) { if ($flipUrl->getParam('flipped')) {
$flipUrl->remove('flipped'); $flipUrl->remove('flipped');
} else { } else {
$flipUrl->setParam('flipped'); $flipUrl->setParam('flipped');

4
modules/monitoring/application/controllers/ListController.php
View File

@ -589,7 +589,7 @@ class ListController extends Controller
$this->applyRestriction('monitoring/filter/objects', $query); $this->applyRestriction('monitoring/filter/objects', $query);
$this->filterQuery($query); $this->filterQuery($query);
$filter = (bool) $this->params->shift('problems', false) ? Filter::where('service_problem', 1) : null; $filter = (bool) $this->params->shift('problems', false) ? Filter::where('service_problem', 1) : null;
if ($this->params->has('flipped')) { if ($this->params->get('flipped', false)) {
$pivot = $query $pivot = $query
->pivot( ->pivot(
'host_name', 'host_name',
@ -619,7 +619,7 @@ class ListController extends Controller
list($pivotData, $pivotHeader) = $pivot->toArray(); list($pivotData, $pivotHeader) = $pivot->toArray();
$this->view->pivotData = $pivotData; $this->view->pivotData = $pivotData;
$this->view->pivotHeader = $pivotHeader; $this->view->pivotHeader = $pivotHeader;
if ($this->params->get('flipped')) { if ($this->params->get('flipped', false)) {
$this->render('servicegrid-flipped'); $this->render('servicegrid-flipped');
} }
} }