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

Eventhistory: Fetch object names using their columns with initial collation 

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-09 14:17:27 +02:00
parent bc6a086ff8
commit 84a2727523
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/controllers/ListController.php
View File

@ -623,9 +623,7 @@ class Monitoring_ListController extends Controller
'attempt', 'attempt',
'max_attempts', 'max_attempts',
'output', 'output',
'type', 'type'
'host',
'service'
)); ));
$this->filterQuery($query); $this->filterQuery($query);

6
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -34,7 +34,7 @@ use Icinga\Module\Monitoring\Object\Service;
$icon = 'help'; $icon = 'help';
$title = $event->type; $title = $event->type;
$stateName = 'invalid'; $stateName = 'invalid';
$isService = isset($event->service); $isService = isset($event->service_description);
switch ($event->type) { switch ($event->type) {
case 'notify': case 'notify':
$icon = 'bell'; $icon = 'bell';
@ -99,10 +99,10 @@ use Icinga\Module\Monitoring\Object\Service;
<td> <td>
<?php if ($isService): ?> <?php if ($isService): ?>
<?= $this->link()->service( <?= $this->link()->service(
$event->service, $event->service_display_name, $event->host, $event->host_display_name $event->service_description, $event->service_display_name, $event->host_name, $event->host_display_name
) ?> ) ?>
<?php else: ?> <?php else: ?>
<?= $this->link()->host($event->host, $event->host_display_name) ?> <?= $this->link()->host($event->host_name, $event->host_display_name) ?>
<?php endif ?> <?php endif ?>
<br> <br>
<div> <div>