From bd5de0949dce73c0e04edaa7d351eeeb8595af11 Mon Sep 17 00:00:00 2001 From: Nicolai Buchwitz Date: Sun, 22 Oct 2017 14:28:02 +0200 Subject: [PATCH] Remove array syntax from default comment filter 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 --- .../monitoring/application/controllers/CommentController.php | 2 +- modules/monitoring/configuration.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php index 4e085c5b9..4d82a0080 100644 --- a/modules/monitoring/application/controllers/CommentController.php +++ b/modules/monitoring/application/controllers/CommentController.php @@ -68,7 +68,7 @@ class CommentController extends Controller $this->view->comment = $this->comment; 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 ->populate(array( diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php index a096e9e9d..4c144e226 100644 --- a/modules/monitoring/configuration.php +++ b/modules/monitoring/configuration.php @@ -198,7 +198,7 @@ $section->add(N_('Contactgroups'), array( 'priority' => 70 )); $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 )); $section->add(N_('Downtimes'), array(