From a240e306ede8573da1a79c2eeb5d47261cfeffa9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Wed, 3 Jun 2020 15:59:06 +0200
Subject: [PATCH] Preserve/Remove param `showCompact` instead of `view`

---
 library/Icinga/Web/Controller.php                               | 2 +-
 modules/monitoring/application/controllers/ListController.php   | 2 +-
 .../monitoring/application/controllers/ServicesController.php   | 2 +-
 .../monitoring/application/views/scripts/list/comments.phtml    | 2 +-
 .../monitoring/application/views/scripts/list/contacts.phtml    | 2 +-
 .../monitoring/application/views/scripts/list/downtimes.phtml   | 2 +-
 .../monitoring/application/views/scripts/list/hostgroups.phtml  | 2 +-
 modules/monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../application/views/scripts/list/notifications.phtml          | 2 +-
 .../application/views/scripts/list/servicegroups.phtml          | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml    | 2 +-
 .../application/views/scripts/partials/event-history.phtml      | 2 +-
 .../application/views/scripts/partials/show-more.phtml          | 2 +-
 modules/monitoring/library/Monitoring/DataView/DataView.php     | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 7409dfa7e..dba085a58 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -235,7 +235,7 @@ class Controller extends ModuleActionController
             'sort', // setupSortControl()
             'dir', // setupSortControl()
             'backend', // Framework
-            'view', // Framework
+            'showCompact', // Framework
             '_dev' // Framework
         );
 
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 1e6ce6db1..251a45506 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -355,7 +355,7 @@ class ListController extends Controller
         $this->view->form = $form;
 
         $this->params
-            ->remove('view')
+            ->remove('showCompact')
             ->remove('format');
         $orientation = $this->params->shift('vertical', 0) ? 'vertical' : 'horizontal';
 /*
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1d65de919..6c6559210 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -35,7 +35,7 @@ class ServicesController extends Controller
         $serviceList = new ServiceList($this->backend);
         $this->applyRestriction('monitoring/filter/objects', $serviceList);
         $serviceList->addFilter(Filter::fromQueryString(
-            (string) $this->params->without(array('service_problem', 'service_handled', 'view'))
+            (string) $this->params->without(array('service_problem', 'service_handled', 'showCompact'))
         ));
         $this->serviceList = $serviceList;
         $this->serviceList->setColumns(array(
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 4941922a9..4ea24dfd3 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -43,7 +43,7 @@
     <div class="action-links">
         <?= $this->qlink(
             $this->translate('Show More'),
-            $this->url()->without(array('view', 'limit')),
+            $this->url()->without(array('showCompact', 'limit')),
             null,
             array(
                 'class'               => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 68f8d3eeb..4928ce1d7 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -71,7 +71,7 @@
     <div class="action-links">
         <?= $this->qlink(
             $this->translate('Show More'),
-            $this->url()->without(array('view', 'limit')),
+            $this->url()->without(array('showCompact', 'limit')),
             null,
             array(
                 'class'             => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index cefddfa53..dfef61760 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -46,7 +46,7 @@ if (! $this->compact): ?>
     <div class="action-links">
         <?= $this->qlink(
             $this->translate('Show More'),
-            $this->url()->without(array('view', 'limit')),
+            $this->url()->without(array('showCompact', 'limit')),
             null,
             array(
                 'class'             => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index aab39f800..2a18517a2 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -284,7 +284,7 @@ if (! $this->compact): ?>
     <div class="action-links">
         <?= $this->qlink(
             $this->translate('Show More'),
-            $this->url()->without(array('view', 'limit')),
+            $this->url()->without(array('showCompact', 'limit')),
             null,
             array(
                 'class'             => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 1b8466ce3..5ff6aea72 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -102,7 +102,7 @@ if (! $this->compact): ?>
     <div class="action-links">
         <?= $this->qlink(
             $this->translate('Show More'),
-            $this->url()->without(array('view', 'limit')),
+            $this->url()->without(array('showCompact', 'limit')),
             null,
             array(
                 'class'             => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 14e33b654..51ef4326b 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -112,7 +112,7 @@ if (! $this->compact): ?>
     <div class="action-links">
         <?= $this->qlink(
             $this->translate('Show More'),
-            $this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('view', 'limit')),
+            $this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('showCompact', 'limit')),
             null,
             array(
                 'class'             => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 431fc8e56..502655187 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -172,7 +172,7 @@ if (! $this->compact): ?>
 <div class="action-links">
     <?= $this->qlink(
         $this->translate('Show More'),
-        $this->url()->without(array('view', 'limit')),
+        $this->url()->without(array('showCompact', 'limit')),
         null,
         array(
             'class'             => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 60a39a32a..9b785a073 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -130,7 +130,7 @@ if (! $this->compact): ?>
 <div class="action-links">
     <?= $this->qlink(
         $this->translate('Show More'),
-        $this->url()->without(array('view', 'limit')),
+        $this->url()->without(array('showCompact', 'limit')),
         null,
         array(
             'class'             => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/partials/event-history.phtml b/modules/monitoring/application/views/scripts/partials/event-history.phtml
index 73eb33bf4..cc1862362 100644
--- a/modules/monitoring/application/views/scripts/partials/event-history.phtml
+++ b/modules/monitoring/application/views/scripts/partials/event-history.phtml
@@ -247,7 +247,7 @@ $rowAction = Url::fromPath('monitoring/event/show');
     <?php if ($this->compact) {
         echo $this->qlink(
             $this->translate('Show More'),
-            $url->without(array('view', 'limit')),
+            $url->without(array('showCompact', 'limit')),
             null,
             array(
                 'class'             => 'action-link',
diff --git a/modules/monitoring/application/views/scripts/partials/show-more.phtml b/modules/monitoring/application/views/scripts/partials/show-more.phtml
index 4265ba8dd..fd6a99dc8 100644
--- a/modules/monitoring/application/views/scripts/partials/show-more.phtml
+++ b/modules/monitoring/application/views/scripts/partials/show-more.phtml
@@ -4,7 +4,7 @@ if ($dataView->hasMore()): ?>
 <div class="text-right">
     <?= $this->qlink(
         $this->translate('Show More'),
-        $this->url()->without(array('view', 'limit')),
+        $this->url()->without(array('showCompact', 'limit')),
         null,
         array(
             'data-base-target'  => '_next',
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 193f9300a..39c5305b1 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -147,7 +147,7 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
         $dir = $url->shift('dir');
         $page = $url->shift('page');
         $format = $url->shift('format');
-        $view = $url->shift('view');
+        $view = $url->shift('showCompact');
         $view = $url->shift('backend');
         foreach ($url->getParams() as $k => $v) {
             $this->where($k, $v);