composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	setup/modelfactory.class.inc.php
#	setup/setuputils.class.inc.php
This commit is contained in:
Pierre Goiffon
2024-03-13 09:27:06 +01:00
parent 289ca7b505 986c24d777
commit a337ef3d88
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/applicationextension.inc.php
View File

@@ -2037,8 +2037,16 @@ class RestUtils
elseif (is_string($key))
{
// OQL
$oSearch = DBObjectSearch::FromOQL($key);
}
try {
$oSearch = DBObjectSearch::FromOQL($key);
} catch (Exception $e) {
throw new CoreOqlException('Query failed to execute', [
'query' => $key,
'exception_class' => get_class($e),
'exception_message' => $e->getMessage(),
]);
}
}
else
{
throw new Exception("Wrong format for key");