]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Tweak improve getting object types and names
authorMarcin Haba <marcin.haba@bacula.pl>
Thu, 1 Jun 2023 13:46:13 +0000 (15:46 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Thu, 1 Jun 2023 13:50:42 +0000 (15:50 +0200)
gui/baculum/protected/API/Modules/ObjectManager.php

index c99a3fe7794d295944460671d2558ad8386d4e9f..a6437e94ac576a45ecce6c615e7e695ba00a8fc9 100644 (file)
@@ -667,11 +667,11 @@ JOIN Job USING (JobId) '
         */
        public function getObjectTypes() {
                $sql = 'SELECT DISTINCT ObjectType as objecttype
-                       FROM Object';
+                       FROM Object
+                       ORDER BY ObjectType';
                $statement = Database::runQuery($sql);
                $result = $statement->fetchAll(\PDO::FETCH_GROUP);
                $values = array_keys($result);
-               sort($values);
                return $values;
        }
 
@@ -691,11 +691,10 @@ JOIN Job USING (JobId) '
                }
                $sql = 'SELECT DISTINCT ObjectName as objectname
                        FROM Object
-                       ' . $limit;
+                       ORDER BY ObjectName ' . $limit;
                $statement = Database::runQuery($sql);
                $result = $statement->fetchAll(\PDO::FETCH_GROUP);
                $values = array_keys($result);
-               sort($values);
                return $values;
        }
 }