From c401f5356ccb1f002767dfacb41d67145164897c Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 1 Jun 2018 14:55:14 +0200 Subject: [PATCH] HostServiceTables: drop useless group() fixes #1509 --- library/Director/Web/Table/IcingaHostAppliedServicesTable.php | 2 +- library/Director/Web/Table/IcingaServiceSetServiceTable.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/Director/Web/Table/IcingaHostAppliedServicesTable.php b/library/Director/Web/Table/IcingaHostAppliedServicesTable.php index 7c86e55f..850bce4c 100644 --- a/library/Director/Web/Table/IcingaHostAppliedServicesTable.php +++ b/library/Director/Web/Table/IcingaHostAppliedServicesTable.php @@ -130,7 +130,7 @@ class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable ['hsb' => 'icinga_host_service_blacklist'], $db->quoteInto('s.id = hsb.service_id AND hsb.host_id = ?', $this->host->get('id')), [] - )->group('s.id')->where('object_type = ? AND assign_filter IS NOT NULL', 'apply'); + )->where('object_type = ? AND assign_filter IS NOT NULL', 'apply'); return $db->fetchAll($query); } diff --git a/library/Director/Web/Table/IcingaServiceSetServiceTable.php b/library/Director/Web/Table/IcingaServiceSetServiceTable.php index 5933f586..4944fe12 100644 --- a/library/Director/Web/Table/IcingaServiceSetServiceTable.php +++ b/library/Director/Web/Table/IcingaServiceSetServiceTable.php @@ -209,7 +209,7 @@ class IcingaServiceSetServiceTable extends ZfQueryBasedTable $this->affectedHost->get('id') ), [] - )->group('s.id')->columns([ + )->columns([ 'blacklisted' => "CASE WHEN hsb.service_id IS NULL THEN 'n' ELSE 'y' END", ]); } else {