From 1c29b03b84faee2a873e40b73da526f24afc6987 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Fri, 27 Apr 2018 10:13:58 +0200
Subject: [PATCH] Revert "Merge pull request #3413 from
 Icinga/bugfix/filter-contacts-assigned-to-services-3088"

This reverts commit 33247237afc2691463e82e889e49fe735177e186, reversing
changes made to 37aeb83cd92ee74c0e5481aa58fc0084c18d4978.

refs #3436
---
 .../application/views/scripts/show/contact.phtml         | 9 ++++-----
 .../Monitoring/Backend/Ido/Query/ContactQuery.php        | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index 3f70ee6ce..027301c88 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -3,17 +3,16 @@
  <?php if (! $this->compact): ?>
   <?= $this->tabs; ?>
  <?php endif ?>
+  <h1><?= $this->translate('Contact details') ?></h1>
+  <div class="circular" style="background-image: url('<?=
+      $this->href('static/gravatar', array('email' => $contact->contact_email))
+  ?>')"></div>
 
 <?php if (! $contact): ?>
   <?= $this->translate('No such contact') ?>: <?= $contactName ?>
 </div>
 <?php return; endif ?>
 
-  <h1><?= $this->translate('Contact details') ?></h1>
-  <div class="circular" style="background-image: url('<?=
-      $this->href('static/gravatar', array('email' => $contact->contact_email))
-  ?>')"></div>
-
   <table class="avp" style="width: 70%">
     <tbody>
       <tr>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index cddbc44c9..196c50cd2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -148,7 +148,6 @@ class ContactQuery extends IdoQuery
      */
     protected function joinHosts()
     {
-        $this->requireVirtualTable('services');
         $this->select->joinLeft(
             array('hc' => $this->prefix . 'host_contacts'),
             'hc.contact_object_id = c.contact_object_id',
@@ -159,7 +158,7 @@ class ContactQuery extends IdoQuery
             array()
         )->joinLeft(
             array('ho' => $this->prefix . 'objects'),
-            '(ho.object_id = h.host_object_id OR ho.object_id = s.host_object_id) AND ho.is_active = 1',
+            'ho.object_id = h.host_object_id AND ho.is_active = 1',
             array()
         );
     }