From: Marcin Haba <marcin.haba@bacula.pl>
Date: Thu, 1 Jun 2023 13:46:13 +0000 (+0200)
Subject: baculum: Tweak improve getting object types and names
X-Git-Tag: Release-13.0.4~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f4d6198ee6324a425ea554c5b689dda08d647b3;p=thirdparty%2Fbacula.git

baculum: Tweak improve getting object types and names
---

diff --git a/gui/baculum/protected/API/Modules/ObjectManager.php b/gui/baculum/protected/API/Modules/ObjectManager.php
index c99a3fe77..a6437e94a 100644
--- a/gui/baculum/protected/API/Modules/ObjectManager.php
+++ b/gui/baculum/protected/API/Modules/ObjectManager.php
@@ -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;
 	}
 }