tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-30 17:24:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

ObjectSetTable: fix on pgsql

Browse Source
This commit is contained in:
Thomas Gelf 2023-09-21 16:02:07 +02:00
parent 4d050834db
commit 7c2a3f254b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/82-Changelog.md
View File

@ -23,6 +23,7 @@ This version hasn't been released yet
* FIX: Template usage table had no header (#2780) * FIX: Template usage table had no header (#2780)
* FIX: Strikethrough for deactivated services in applied Service Set (#2746, #2766) * FIX: Strikethrough for deactivated services in applied Service Set (#2746, #2766)
* FIX: editing multi-selected services with the same name has been fixed (#2798) * FIX: editing multi-selected services with the same name has been fixed (#2798)
* FIX: Service Sets table with PostgreSQL (#2799)
### Icinga Configuration ### Icinga Configuration
* FEATURE: render fallback template for IfW 1.11 for Icinga < 2.14 (#2776) * FEATURE: render fallback template for IfW 1.11 for Icinga < 2.14 (#2776)

4
library/Director/Web/Table/ObjectSetTable.php
View File

@ -22,7 +22,7 @@ class ObjectSetTable extends ZfQueryBasedTable
'os.object_name', 'os.object_name',
'os.description', 'os.description',
'os.assign_filter', 'os.assign_filter',
'service_object_name', 'o.object_name',
]; ];
private $type; private $type;
@ -98,7 +98,6 @@ class ObjectSetTable extends ZfQueryBasedTable
'object_type' => 'os.object_type', 'object_type' => 'os.object_type',
'assign_filter' => 'os.assign_filter', 'assign_filter' => 'os.assign_filter',
'description' => 'os.description', 'description' => 'os.description',
'service_object_name' => 'o.object_name',
'count_services' => 'COUNT(DISTINCT o.uuid)', 'count_services' => 'COUNT(DISTINCT o.uuid)',
]; ];
if ($this->branchUuid) { if ($this->branchUuid) {
@ -185,7 +184,6 @@ class ObjectSetTable extends ZfQueryBasedTable
->group('object_type') ->group('object_type')
->group('assign_filter') ->group('assign_filter')
->group('description') ->group('description')
->group('service_object_name')
->group('count_services'); ->group('count_services');
} }
} else { } else {