From a93ef04d5db0b1c1c909c073e0f67e3db88151f5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:30:02 +0200
Subject: [PATCH] Revert "Add new tab to switch between host and service
 multi-selection"

This reverts commit 45a0982bebb411ed8a202696965c1438b5948c2c.

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.
---
 .../application/controllers/HostsController.php        | 10 ++--------
 .../application/controllers/ServicesController.php     |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 20ae71e6b..253a1fb74 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -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)
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1a8ec9a58..8381a640d 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -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(