baculum: Change overview behaviour in objects endpoint if used together with groupby...

diff --git a/gui/baculum/protected/API/Modules/ObjectManager.php b/gui/baculum/protected/API/Modules/ObjectManager.php
index 4b0724571ba13a5e6a9b95ed6887c9cf615c02e4..45e65781372fa084a5f4df4a27695c24696e67a5 100644 (file)
--- a/gui/baculum/protected/API/Modules/ObjectManager.php
+++ b/gui/baculum/protected/API/Modules/ObjectManager.php
@@ -123,7 +123,7 @@ LEFT JOIN Client USING (ClientId) '
                        // Overview mode.
                        $result = [
                                'objects' => $result,
-                               'overview' => $overview
+                               'overview' => (is_string($group_by) ? $overview : $this->getObjectCountByObjectType($criteria))
                        ];
                }
                return $result;

diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index beadb4dc7ff5ec925d3312d960fb17a25d749852..afeb9b703f31ab47bd405ad79549acfd934e3d6e 100644 (file)
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -8068,7 +8068,7 @@
                                                "name": "overview",
                                                "in": "query",
                                                "required": false,
-                                               "description": "If set, it puts objects in 'objects' property and adds the 'overview' property with the object count by object type (PostgreSQL, MySQL, vSphere ...etc.)  NOTE: Offset and limit parameters do not apply to overview counts.",
+                                               "description": "If set, it puts objects in 'objects' property and adds the 'overview' property with the object count by object type (PostgreSQL, MySQL, vSphere ...etc.)  NOTE: Offset and limit parameters do apply to overview counts if used together 'groupby' parameter. With 'groupby' the counters behaviour is chanining and they display only count of currently listed objects.",
                                                "schema": {
                                                        "type": "boolean"
                                                }