tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3437 from Icinga/fix/revert-pull-request-3413

Browse Source 
Revert pull request #3413
This commit is contained in:
Johannes Meyer 2018-04-27 10:19:05 +02:00 committed by GitHub
commit 2c387ea34d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/monitoring/application/views/scripts/show/contact.phtml
View File

@ -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>

3
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
View File

@ -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()
); );
} }