ObjectSetTable: fix on pgsql

Icinga · Sep 21, 2023 · 7c2a3f2 · 7c2a3f2
1 parent 4d05083
commit 7c2a3f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
@@ -23,6 +23,7 @@ This version hasn't been released yet
 * FIX: Template usage table had no header (#2780)
 * 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: Service Sets table with PostgreSQL (#2799)
 
 ### Icinga Configuration
 * FEATURE: render fallback template for IfW 1.11 for Icinga &lt; 2.14 (#2776)

diff --git a/library/Director/Web/Table/ObjectSetTable.php b/library/Director/Web/Table/ObjectSetTable.php
@@ -22,7 +22,7 @@ class ObjectSetTable extends ZfQueryBasedTable
         'os.object_name',
         'os.description',
         'os.assign_filter',
-        'service_object_name',
+        'o.object_name',
     ];
 
     private $type;
@@ -98,7 +98,6 @@ protected function prepareQuery()
             'object_type'    => 'os.object_type',
             'assign_filter'  => 'os.assign_filter',
             'description'    => 'os.description',
-            'service_object_name' => 'o.object_name',
             'count_services' => 'COUNT(DISTINCT o.uuid)',
         ];
         if ($this->branchUuid) {
@@ -185,7 +184,6 @@ protected function prepareQuery()
                     ->group('object_type')
                     ->group('assign_filter')
                     ->group('description')
-                    ->group('service_object_name')
                     ->group('count_services');
             }
         } else {