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

monitoring/detail: Display the comment of the ack next to the ack

Browse Source 
refs #9674
This commit is contained in:
Eric Lippmann 2015-09-03 16:39:56 +02:00
parent f0e8340fbd
commit 2da49ad697
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
View File

@ -8,14 +8,32 @@ if (in_array((int) $object->state, array(0, 99))) {
} }
if ($object->acknowledged): ?> if ($object->acknowledged): ?>
<?php
$acknowledgement = $object->acknowledgement;
/** @var \Icinga\Module\Monitoring\Object\Acknowledgement $acknowledgement */
?>
<tr> <tr>
<th><?= $this->translate('Acknowledged') ?></th> <th><?= $this->translate('Acknowledged') ?></th>
<td data-base-target="_self"> <td data-base-target="_self">
<?php if (isset($removeAckForm)) { // Form is unset if the current user lacks the respective permission <ul class="inline-comments">
echo $removeAckForm; <li class="comment-item">
} else { <h3>
echo '&#45;'; <?= sprintf(
} ?> $this->translate('%s acknowledged %s'),
'<span class="author">' . $this->escape($acknowledgement->getAuthor()) . '</span>',
$this->timeAgo($acknowledgement->getEntryTime())
) ?>
<?php if (isset($removeAckForm)) {
// Form is unset if the current user lacks the respective permission
echo $removeAckForm;
} ?>
</h3>
<p>
<span class="sr-only">(<?= $this->translate('Comment') ?>): </span>
<?= nl2br($this->createTicketLinks($acknowledgement->getComment()), false) ?>
</p>
</li>
</ul>
</td> </td>
</tr> </tr>
<?php else: ?> <?php else: ?>