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

Revert "Add new tab to switch between host and service multi-selection" 

This reverts commit 45a0982beb.

Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php

The tab was removed w/ another commit I guess. This revert removes the related not yet removed crap.
This commit is contained in:
Eric Lippmann 2015-05-29 13:30:02 +02:00
parent e71682ffb3
commit a93ef04d5d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/application/controllers/HostsController.php
View File

@ -26,14 +26,9 @@ class Monitoring_HostsController extends Controller
public function init()
{
// Support switching from service-view using the host and service selection. The filter would error
// on any occurrence of a filter based on service.
$filterString = preg_replace('/(service=[^)&]*)/', '', (string)$this->params);
$hostList = new HostList($this->backend);
$hostList->setFilter(Filter::fromQueryString((string) $this->params->without('view')));
$hostList->setFilter(Filter::fromQueryString((string) $this->params));
$this->hostList = $hostList;
$this->getTabs()->add(
'show',
array(
@ -46,8 +41,7 @@ class Monitoring_HostsController extends Controller
'icon' => 'host'
)
)->extend(new DashboardAction())->activate('show');
$this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts')->setQueryString($filterString);
$this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts');
}
protected function handleCommandForm(ObjectsCommandForm $form)

1
modules/monitoring/application/controllers/ServicesController.php
View File

@ -32,7 +32,6 @@ class Monitoring_ServicesController extends Controller
));
$this->serviceList = $serviceList;
$this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
$this->getTabs()->add(
'show',
array(