From cd2a0fd6c5d0ca5f7f0677f7aaf4341779c2f93b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Tue, 16 Apr 2019 13:53:03 +0200
Subject: [PATCH 1/4] list/hostgroups: Preserve filter when switching to grid
 mode

refs #3664
---
 .../monitoring/application/views/scripts/list/hostgroups.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index c076ec8f9..3bfd59fa2 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -8,7 +8,7 @@ if (! $this->compact): ?>
     <div class="sort-controls-container">
         <?= $this->limiter ?>
         <?= $this->sortBox ?>
-        <a href="<?= $this->href('monitoring/list/hostgroup-grid') ?>" class="grid-toggle-link"
+        <a href="<?= $this->href('monitoring/list/hostgroup-grid')->addFilter($this->filterEditor->getFilter()) ?>" class="grid-toggle-link"
            title="<?= $this->translate('Toogle grid view mode') ?>">
             <?= $this->icon('th-list', null, ['class' => '-active']) ?>
             <?= $this->icon('th-thumb-empty', null, ['class' => '-inactive']) ?>

From 6761aecb602d04919b850e57fb5fcea8c16a0958 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Tue, 16 Apr 2019 13:53:54 +0200
Subject: [PATCH 2/4] list/servicegroups: Preserve filter when switching to
 grid mode

refs #3664
---
 .../application/views/scripts/list/servicegroups.phtml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 87ced6a95..4a78fbd46 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -7,7 +7,7 @@ if (! $this->compact): ?>
     <div class="sort-controls-container">
         <?= $this->limiter ?>
         <?= $this->sortBox ?>
-        <a href="<?= $this->href('monitoring/list/servicegroup-grid') ?>" class="grid-toggle-link"
+        <a href="<?= $this->href('monitoring/list/servicegroup-grid')->addFilter($this->filterEditor->getFilter()) ?>" class="grid-toggle-link"
            title="<?= $this->translate('Toogle grid view mode') ?>">
             <?= $this->icon('th-list', null, ['class' => '-active']) ?>
             <?= $this->icon('th-thumb-empty', null, ['class' => '-inactive']) ?>

From da415b8fe67ef574032b38fe1c2000aff96ad08a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Tue, 16 Apr 2019 13:54:27 +0200
Subject: [PATCH 3/4] list/hostgroup-grid: Preserve filter when navigating away

refs #3664
---
 .../views/scripts/list/hostgroup-grid.phtml      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroup-grid.phtml b/modules/monitoring/application/views/scripts/list/hostgroup-grid.phtml
index c5f9b4d9d..34498d03c 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroup-grid.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroup-grid.phtml
@@ -3,7 +3,7 @@
     <?= $this->tabs ?>
     <div class="sort-controls-container">
         <?= $this->sortBox ?>
-        <a href="<?= $this->href('monitoring/list/hostgroups') ?>" class="grid-toggle-link"
+        <a href="<?= $this->href('monitoring/list/hostgroups')->addFilter($this->filterEditor->getFilter()) ?>" class="grid-toggle-link"
            title="<?= $this->translate('Toogle grid view mode') ?>">
             <?= $this->icon('th-list', null, ['class' => '-inactive']) ?>
             <?= $this->icon('th-thumb-empty', null, ['class' => '-active']) ?>
@@ -24,7 +24,7 @@ if (! $hostGroups->hasResult()): ?>
     <?php if ($hostGroup->hosts_down_unhandled > 0): ?>
         <?= $this->qlink(
             $hostGroup->hosts_down_unhandled,
-            'monitoring/list/hosts',
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
             [
                 'hostgroup_name'    => $hostGroup->hostgroup_name,
                 'host_handled'      => 0,
@@ -46,7 +46,7 @@ if (! $hostGroups->hasResult()): ?>
     <?php elseif ($hostGroup->hosts_unreachable_unhandled > 0): ?>
         <?= $this->qlink(
             $hostGroup->hosts_unreachable_unhandled,
-            'monitoring/list/hosts',
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
             [
                 'hostgroup_name'    => $hostGroup->hostgroup_name,
                 'host_handled'      => 0,
@@ -68,7 +68,7 @@ if (! $hostGroups->hasResult()): ?>
     <?php elseif ($hostGroup->hosts_down_handled > 0): ?>
         <?= $this->qlink(
             $hostGroup->hosts_down_handled,
-            'monitoring/list/hosts',
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
             [
                 'hostgroup_name'    => $hostGroup->hostgroup_name,
                 'host_handled'      => 1,
@@ -90,7 +90,7 @@ if (! $hostGroups->hasResult()): ?>
     <?php elseif ($hostGroup->hosts_unreachable_handled > 0): ?>
         <?= $this->qlink(
             $hostGroup->hosts_unreachable_handled,
-            'monitoring/list/hosts',
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
             [
                 'hostgroup_name'    => $hostGroup->hostgroup_name,
                 'host_handled'      => 0,
@@ -112,7 +112,7 @@ if (! $hostGroups->hasResult()): ?>
     <?php elseif ($hostGroup->hosts_pending > 0): ?>
         <?= $this->qlink(
             $hostGroup->hosts_pending,
-            'monitoring/list/hosts',
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
             [
                 'hostgroup_name'    => $hostGroup->hostgroup_name,
                 'host_state'        => 99
@@ -133,7 +133,7 @@ if (! $hostGroups->hasResult()): ?>
     <?php elseif ($hostGroup->hosts_up > 0): ?>
         <?= $this->qlink(
             $hostGroup->hosts_up,
-            'monitoring/list/hosts',
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
             [
                 'hostgroup_name'    => $hostGroup->hostgroup_name,
                 'host_state'        => 0
@@ -158,7 +158,7 @@ if (! $hostGroups->hasResult()): ?>
     <?php endif ?>
         <?= $this->qlink(
             $hostGroup->hostgroup_alias,
-            'monitoring/list/hosts',
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
             ['hostgroup_name' => $hostGroup->hostgroup_name],
             [
                 'title' => sprintf(

From dc8184ccf1f5f8e31ec99ed48da2fe63dc193dfc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Tue, 16 Apr 2019 13:54:55 +0200
Subject: [PATCH 4/4] list/servicegroup-grid: Preserve filter when navigating
 away

refs #3664
---
 .../scripts/list/servicegroup-grid.phtml      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroup-grid.phtml b/modules/monitoring/application/views/scripts/list/servicegroup-grid.phtml
index cc2e044bc..5ea6d17e4 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroup-grid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroup-grid.phtml
@@ -3,7 +3,7 @@
     <?= $this->tabs ?>
     <div class="sort-controls-container">
         <?= $this->sortBox ?>
-        <a href="<?= $this->href('monitoring/list/servicegroups') ?>" class="grid-toggle-link"
+        <a href="<?= $this->href('monitoring/list/servicegroups')->addFilter($this->filterEditor->getFilter()) ?>" class="grid-toggle-link"
            title="<?= $this->translate('Toogle grid view mode') ?>">
             <?= $this->icon('th-list', null, ['class' => '-inactive']) ?>
             <?= $this->icon('th-thumb-empty', null, ['class' => '-active']) ?>
@@ -24,7 +24,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php if ($serviceGroup->services_critical_unhandled > 0): ?>
         <?= $this->qlink(
             $serviceGroup->services_critical_unhandled,
-            'monitoring/list/servicegrid',
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
             [
                 'servicegroup_name' => $serviceGroup->servicegroup_name,
                 'service_handled'   => 0,
@@ -46,7 +46,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php elseif ($serviceGroup->services_warning_unhandled > 0): ?>
         <?= $this->qlink(
             $serviceGroup->services_warning_unhandled,
-            'monitoring/list/servicegrid',
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
             [
                 'servicegroup_name' => $serviceGroup->servicegroup_name,
                 'service_handled'   => 0,
@@ -68,7 +68,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php elseif ($serviceGroup->services_unknown_unhandled > 0): ?>
         <?= $this->qlink(
             $serviceGroup->services_unknown_unhandled,
-            'monitoring/list/servicegrid',
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
             [
                 'servicegroup_name' => $serviceGroup->servicegroup_name,
                 'service_handled'   => 0,
@@ -90,7 +90,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php elseif ($serviceGroup->services_critical_handled > 0): ?>
         <?= $this->qlink(
             $serviceGroup->services_critical_handled,
-            'monitoring/list/servicegrid',
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
             [
                 'servicegroup_name' => $serviceGroup->servicegroup_name,
                 'service_handled'   => 1,
@@ -112,7 +112,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php elseif ($serviceGroup->services_warning_handled > 0): ?>
         <?= $this->qlink(
             $serviceGroup->services_warning_handled,
-            'monitoring/list/servicegrid',
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
             [
                 'servicegroup_name' => $serviceGroup->servicegroup_name,
                 'service_handled'   => 1,
@@ -134,7 +134,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php elseif ($serviceGroup->services_unknown_handled > 0): ?>
         <?= $this->qlink(
             $serviceGroup->services_unknown_handled,
-            'monitoring/list/servicegrid',
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
             [
                 'servicegroup_name' => $serviceGroup->servicegroup_name,
                 'service_handled'   => 1,
@@ -156,7 +156,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php elseif ($serviceGroup->services_pending > 0): ?>
         <?= $this->qlink(
             $serviceGroup->services_pending,
-            'monitoring/list/servicegrid',
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
             [
                 'servicegroup_name' => $serviceGroup->servicegroup_name,
                 'service_state'     => 99
@@ -177,7 +177,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php elseif ($serviceGroup->services_ok > 0): ?>
         <?= $this->qlink(
             $serviceGroup->services_ok,
-            'monitoring/list/servicegrid',
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
             [
                 'servicegroup_name' => $serviceGroup->servicegroup_name,
                 'service_state'     => 0
@@ -202,7 +202,7 @@ if (! $serviceGroups->hasResult()): ?>
     <?php endif ?>
     <?= $this->qlink(
         $serviceGroup->servicegroup_alias,
-        'monitoring/list/servicegrid',
+        $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
         ['servicegroup_name' => $serviceGroup->servicegroup_name],
         [
             'title' => sprintf(