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

Remove array syntax from default comment filter

Browse Source 
Added comment types 'comment' and 'ack' as separate fields and removed
the array syntax due to problems with the filter editor.

refs #2925

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
This commit is contained in:
Nicolai Buchwitz 2017-10-22 14:28:02 +02:00 committed by Eric Lippmann
parent c22efa4519
commit bd5de0949d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/application/controllers/CommentController.php
View File

@ -68,7 +68,7 @@ class CommentController extends Controller
$this->view->comment = $this->comment; $this->view->comment = $this->comment;
if ($this->hasPermission('monitoring/command/comment/delete')) { if ($this->hasPermission('monitoring/command/comment/delete')) {
$listUrl = Url::fromPath('monitoring/list/comments')->setQueryString('comment_type=(comment|ack)'); $listUrl = Url::fromPath('monitoring/list/comments')->setQueryString('comment_type=comment|comment_type=ack');
$form = new DeleteCommentCommandForm(); $form = new DeleteCommentCommandForm();
$form $form
->populate(array( ->populate(array(

2
modules/monitoring/configuration.php
View File

@ -198,7 +198,7 @@ $section->add(N_('Contactgroups'), array(
'priority' => 70 'priority' => 70
)); ));
$section->add(N_('Comments'), array( $section->add(N_('Comments'), array(
'url' => 'monitoring/list/comments?comment_type=(comment|ack)', 'url' => 'monitoring/list/comments?comment_type=comment|comment_type=ack',
'priority' => 80 'priority' => 80
)); ));
$section->add(N_('Downtimes'), array( $section->add(N_('Downtimes'), array(