From abbf486ed45b330ef05aecc0cb6fab5a45ab706e Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 4 Aug 2022 16:07:28 +0200 Subject: [PATCH] Drop `view` param from show more urls in all index routes refs #463 --- application/controllers/CommentsController.php | 2 +- application/controllers/DowntimesController.php | 2 +- application/controllers/HostgroupsController.php | 2 +- application/controllers/HostsController.php | 2 +- application/controllers/ServicegroupsController.php | 2 +- application/controllers/ServicesController.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/controllers/CommentsController.php b/application/controllers/CommentsController.php index b3f979e5..298fae56 100644 --- a/application/controllers/CommentsController.php +++ b/application/controllers/CommentsController.php @@ -88,7 +88,7 @@ class CommentsController extends Controller if ($compact) { $this->addContent( - (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit']))) + (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit', 'view']))) ->setBaseTarget('_next') ->setAttribute('title', sprintf( t('Show all %d comments'), diff --git a/application/controllers/DowntimesController.php b/application/controllers/DowntimesController.php index 5f6a880c..89fdfc85 100644 --- a/application/controllers/DowntimesController.php +++ b/application/controllers/DowntimesController.php @@ -94,7 +94,7 @@ class DowntimesController extends Controller if ($compact) { $this->addContent( - (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit']))) + (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit', 'view']))) ->setBaseTarget('_next') ->setAttribute('title', sprintf( t('Show all %d downtimes'), diff --git a/application/controllers/HostgroupsController.php b/application/controllers/HostgroupsController.php index ea185d27..a27eeecf 100644 --- a/application/controllers/HostgroupsController.php +++ b/application/controllers/HostgroupsController.php @@ -83,7 +83,7 @@ class HostgroupsController extends Controller if ($compact) { $this->addContent( - (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit']))) + (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit', 'view']))) ->setBaseTarget('_next') ->setAttribute('title', sprintf( t('Show all %d hostgroups'), diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php index 74ff91ca..eaf804a8 100644 --- a/application/controllers/HostsController.php +++ b/application/controllers/HostsController.php @@ -113,7 +113,7 @@ class HostsController extends Controller if ($compact) { $this->addContent( - (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit']))) + (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit', 'view']))) ->setBaseTarget('_next') ->setAttribute('title', sprintf( t('Show all %d hosts'), diff --git a/application/controllers/ServicegroupsController.php b/application/controllers/ServicegroupsController.php index b89db2fc..b00c21a1 100644 --- a/application/controllers/ServicegroupsController.php +++ b/application/controllers/ServicegroupsController.php @@ -82,7 +82,7 @@ class ServicegroupsController extends Controller if ($compact) { $this->addContent( - (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit']))) + (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit', 'view']))) ->setBaseTarget('_next') ->setAttribute('title', sprintf( t('Show all %d servicegroups'), diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php index 97015cef..a3fcbe1e 100644 --- a/application/controllers/ServicesController.php +++ b/application/controllers/ServicesController.php @@ -123,7 +123,7 @@ class ServicesController extends Controller if ($compact) { $this->addContent( - (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit']))) + (new ShowMore($results, Url::fromRequest()->without(['showCompact', 'limit', 'view']))) ->setBaseTarget('_next') ->setAttribute('title', sprintf( t('Show all %d services'),