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

DatafieldTable: fix grouping error on PostgreSQL

Browse Source 
fixes #2310
This commit is contained in:
Thomas Gelf 2021-08-16 05:36:10 +02:00
parent f87eff8a21
commit 093abfd733
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/82-Changelog.md
View File

@ -29,6 +29,7 @@ next (will be 1.9.0)
### User Interface ### User Interface
* FIX: allow switching DB config while connection is failing (#2300) * FIX: allow switching DB config while connection is failing (#2300)
* FIX: Links to duplicate services in Sets didn't check for deactivation (#2323) * FIX: Links to duplicate services in Sets didn't check for deactivation (#2323)
* FIX: SQL error for Data Fields table on PostgreSQL (#2310)
* FEATURE: show "deprecated" flag on object attribute inspection (#2312) * FEATURE: show "deprecated" flag on object attribute inspection (#2312)
* FEATURE: Service Template for single Host services provides auto-completion (#1974) * FEATURE: Service Template for single Host services provides auto-completion (#1974)

2
library/Director/Web/Table/DatafieldTable.php
View File

@ -85,7 +85,7 @@ class DatafieldTable extends ZfQueryBasedTable
['used_vars' => $db->select()->union($varsQueries, ZfDbSelect::SQL_UNION_ALL)], ['used_vars' => $db->select()->union($varsQueries, ZfDbSelect::SQL_UNION_ALL)],
'used_vars.varname = df.varname', 'used_vars.varname = df.varname',
[] []
)->group('df.id')->group('df.varname')->order('caption ASC'); )->group('df.id')->group('df.varname')->group('dfc.category_name')->order('caption ASC');
} }
/** /**