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

N°2555 Specific exception for invalid action_rules

Browse Source
This commit is contained in:
Pierre Goiffon
2019-10-24 18:05:58 +02:00
parent 5c483efd15
commit d4a696cb6b
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/coreexception.class.inc.php
View File

@@ -183,11 +183,25 @@ class CoreCannotSaveObjectException extends CoreException
}
}
/**
* @since 2.7.0 N°2555
*/
class CorePortalInvalidActionRuleException extends CoreException
{
}
/**
* @since 2.7.0 N°2555
*/
class CoreOqlException extends CoreException
{
}
/**
* @since 2.7.0 N°2555
*/
class CoreOqlMultipleResultsForbiddenException extends CoreOqlException
{

7
datamodels/2.x/itop-portal-base/portal/src/Helper/ContextManipulatorHelper.php
View File

@@ -25,7 +25,7 @@ namespace Combodo\iTop\Portal\Helper;
use BinaryExpression;
use Combodo\iTop\Portal\Brick\BrickCollection;
use CoreOqlMultipleResultsForbiddenException;
use CoreUnexpectedValue;
use CorePortalInvalidActionRuleException;
use DBObject;
use DBSearch;
use DOMFormatException;
@@ -279,6 +279,7 @@ class ContextManipulatorHelper
* @throws \Exception
* @throws \CoreException
* @throws \OQLException
* @throws \CorePortalInvalidActionRuleException N°2555 if action_rule query return more than 1 result (we should only have 1 source object)
*/
public function PrepareObject(array $aData, DBObject &$oObject)
{
@@ -351,7 +352,7 @@ class ContextManipulatorHelper
// N°2555 : disallow searches without any condition
$sErrMsg = "Portal query was stopped: action_rule '$sId' searches for '$sSearchClass' without any condition is forbidden";
IssueLog::Error($sErrMsg);
throw new CoreUnexpectedValue($sErrMsg);
throw new CorePortalInvalidActionRuleException($sErrMsg);
}
// Checking for silos
@@ -372,7 +373,7 @@ class ContextManipulatorHelper
// N°2555 : disallow searches returning more than 1 result
$sErrMsg = "Portal query was stopped: action_rule '$sId' gives more than 1 '$sSearchClass' result";
IssueLog::Error($sErrMsg);
throw new CoreUnexpectedValue($sErrMsg);
throw new CorePortalInvalidActionRuleException($sErrMsg);
}
if ($oSourceObject === null)
{