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

Apply temporary fix for the "thing" breaking Web\Request and dispatching

This commit is contained in:
Thomas Gelf 2014-03-08 00:47:35 +00:00
parent d234a87e84
commit c9af498d81
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/monitoring/application/controllers/ShowController.php
View File

@ -98,7 +98,7 @@ class Monitoring_ShowController extends Controller
public function historyAction() public function historyAction()
{ {
$this->getTabs()->activate('history'); $this->getTabs()->activate('history');
$this->view->object->populate(); //$this->view->object->populate();
$this->view->object->fetchEventHistory(); $this->view->object->fetchEventHistory();
$this->handleFormatRequest($this->view->object->eventhistory); $this->handleFormatRequest($this->view->object->eventhistory);
$this->view->history = $this->view->object->eventhistory->limit(20)->paginate(); $this->view->history = $this->view->object->eventhistory->limit(20)->paginate();
@ -107,11 +107,14 @@ class Monitoring_ShowController extends Controller
public function servicesAction() public function servicesAction()
{ {
$this->getTabs()->activate('services'); $this->getTabs()->activate('services');
$this->_setParam('service', null); $this->_setParam('service', '');
// WTF???? UrlViewFilter is messing with $_SERVER['QUERY_STRING'], great!
$_SERVER['QUERY_STRING'] = preg_replace('~&service=[^&]+(?:&|$)~', '', $_SERVER['QUERY_STRING']);
$this->view->services = $this->view->action('services', 'list', 'monitoring', array( $this->view->services = $this->view->action('services', 'list', 'monitoring', array(
'view' => 'compact', 'view' => 'compact',
'limit' => '', 'limit' => '',
'sort' => 'service_description', 'sort' => 'service_description',
'service' => ''
)); ));
} }
@ -163,12 +166,7 @@ class Monitoring_ShowController extends Controller
$params['service'] = $object->service_description; $params['service'] = $object->service_description;
} elseif ($service = $this->_getParam('service')) { } elseif ($service = $this->_getParam('service')) {
$params['service'] = $service; $params['service'] = $service;
} elseif ($service = $this->_getParam('active_service')) {
$params['service'] = $service;
} }
$servicesParams = $params;
$servicesParams['active_service'] = $servicesParams['service'];
unset($servicesParams['service']);
$tabs->add( $tabs->add(
'host', 'host',
array( array(
@ -195,7 +193,7 @@ class Monitoring_ShowController extends Controller
'title' => 'Services', 'title' => 'Services',
'icon' => 'img/icons/service.png', 'icon' => 'img/icons/service.png',
'url' => 'monitoring/show/services', 'url' => 'monitoring/show/services',
'urlParams' => $servicesParams, 'urlParams' => $params,
) )
); );
$tabs->add( $tabs->add(