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

Merge pull request #4658 from Icinga/fix/ghost-columns-upon-comment-removal-4643 

Fix ghost columns upon comment removal
This commit is contained in:
Johannes Meyer 2022-02-07 14:52:17 +01:00 committed by GitHub
parent 4ce8fc820e ae3731f143
commit 77987feaaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/monitoring/application/views/scripts/show/components/comments.phtml
View File

@ -39,14 +39,14 @@ if (empty($object->comments) && ! $addLink) {
echo '<br>' . $addLink; echo '<br>' . $addLink;
} }
?></th> ?></th>
<td data-base-target="_next"> <td data-base-target="_self">
<?php if (empty($object->comments)): <?php if (empty($object->comments)):
echo $addLink; echo $addLink;
else: ?> else: ?>
<dl class="comment-list"> <dl class="comment-list">
<?php foreach ($object->comments as $comment): ?> <?php foreach ($object->comments as $comment): ?>
<dt> <dt>
<a href="<?= $this->href('monitoring/comment/show', array('comment_id' => $comment->id)) ?>"> <a data-base-target="_next" href="<?= $this->href('monitoring/comment/show', array('comment_id' => $comment->id)) ?>">
<?= $this->escape($comment->author) ?> <?= $this->escape($comment->author) ?>
<span class="comment-time"> <span class="comment-time">
<?= $this->translate('commented') ?> <?= $this->translate('commented') ?>
@ -59,6 +59,7 @@ if (empty($object->comments) && ! $addLink) {
) ?> ) ?>
<?php endif ?> <?php endif ?>
</span> </span>
</a>
<?= $comment->persistent ? $this->icon('attach', 'This comment is persistent.') : '' ?> <?= $comment->persistent ? $this->icon('attach', 'This comment is persistent.') : '' ?>
<?php if (isset($delCommentForm)) { <?php if (isset($delCommentForm)) {
// Form is unset if the current user lacks the respective permission // Form is unset if the current user lacks the respective permission
@ -74,7 +75,6 @@ if (empty($object->comments) && ! $addLink) {
); );
echo $deleteButton; echo $deleteButton;
} ?> } ?>
</a>
</dt> </dt>
<dd> <dd>
<?= $this->nl2br($this->createTicketLinks($this->markdownLine($comment->comment, [ 'class' => 'caption']))) ?> <?= $this->nl2br($this->createTicketLinks($this->markdownLine($comment->comment, [ 'class' => 'caption']))) ?>

4
public/css/icinga/main.less
View File

@ -155,12 +155,12 @@ a:hover > .icon-cancel {
&:hover { &:hover {
.var(background-color, gray-lightest); .var(background-color, gray-lightest);
> .remove-action { > .remove-action button:not(.spinner.active) {
visibility: visible; visibility: visible;
} }
} }
> .remove-action { > .remove-action button:not(.spinner.active) {
visibility: hidden; visibility: hidden;
} }
} }