mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-23 22:04:25 +02:00
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
This commit is contained in:
parent
cf079fbc02
commit
1c29b03b84
@ -3,17 +3,16 @@
|
|||||||
<?php if (! $this->compact): ?>
|
<?php if (! $this->compact): ?>
|
||||||
<?= $this->tabs; ?>
|
<?= $this->tabs; ?>
|
||||||
<?php endif ?>
|
<?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): ?>
|
<?php if (! $contact): ?>
|
||||||
<?= $this->translate('No such contact') ?>: <?= $contactName ?>
|
<?= $this->translate('No such contact') ?>: <?= $contactName ?>
|
||||||
</div>
|
</div>
|
||||||
<?php return; endif ?>
|
<?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%">
|
<table class="avp" style="width: 70%">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -148,7 +148,6 @@ class ContactQuery extends IdoQuery
|
|||||||
*/
|
*/
|
||||||
protected function joinHosts()
|
protected function joinHosts()
|
||||||
{
|
{
|
||||||
$this->requireVirtualTable('services');
|
|
||||||
$this->select->joinLeft(
|
$this->select->joinLeft(
|
||||||
array('hc' => $this->prefix . 'host_contacts'),
|
array('hc' => $this->prefix . 'host_contacts'),
|
||||||
'hc.contact_object_id = c.contact_object_id',
|
'hc.contact_object_id = c.contact_object_id',
|
||||||
@ -159,7 +158,7 @@ class ContactQuery extends IdoQuery
|
|||||||
array()
|
array()
|
||||||
)->joinLeft(
|
)->joinLeft(
|
||||||
array('ho' => $this->prefix . 'objects'),
|
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()
|
array()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user