Fix "base model" extraction from getUnions() array

Account changes made in commit 4b09a490, which moved "base models" to the end of the getUnions() array.
Icinga · May 19, 2022 · 7a8216b · 7a8216b
1 parent fbf8743
commit 7a8216b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/library/Icingadb/Common/SearchControls.php b/library/Icingadb/Common/SearchControls.php
@@ -54,7 +54,8 @@ public function createSearchBar(Query $query, array $preserveParams = null): Sea
                 try {
                     if ($query instanceof UnionQuery) {
                         // TODO: This can't be right. Finally solve this god-damn union-query-model structure!!!1
-                        $query = $query->getUnions()[0];
+                        $queries = $query->getUnions();
+                        $query = end($queries);
                     }
 
                     $relationPath = $query->getResolver()->qualifyPath(

diff --git a/library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php b/library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php
@@ -295,7 +295,8 @@ public static function collectFilterColumns(Model $model, Resolver $resolver): G
         }
 
         if ($model instanceof UnionModel) {
-            $baseModelClass = $model->getUnions()[0][0];
+            $queries = $model->getUnions();
+            $baseModelClass = end($queries)[0];
             $model = new $baseModelClass();
         }