mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
N°4314 - Fix Uniqueness rules not working with Silo (2)
This commit is contained in:
@@ -2311,7 +2311,6 @@ abstract class DBObject implements iDisplay
|
|||||||
protected function HasObjectsInDbForUniquenessRule($sUniquenessRuleId, $aUniquenessRuleProperties)
|
protected function HasObjectsInDbForUniquenessRule($sUniquenessRuleId, $aUniquenessRuleProperties)
|
||||||
{
|
{
|
||||||
$oUniquenessQuery = $this->GetSearchForUniquenessRule($sUniquenessRuleId, $aUniquenessRuleProperties);
|
$oUniquenessQuery = $this->GetSearchForUniquenessRule($sUniquenessRuleId, $aUniquenessRuleProperties);
|
||||||
$oUniquenessQuery->AllowAllData();
|
|
||||||
$oUniquenessDuplicates = new DBObjectSet($oUniquenessQuery);
|
$oUniquenessDuplicates = new DBObjectSet($oUniquenessQuery);
|
||||||
$bHasDuplicates = $oUniquenessDuplicates->CountExceeds(0);
|
$bHasDuplicates = $oUniquenessDuplicates->CountExceeds(0);
|
||||||
|
|
||||||
@@ -2357,6 +2356,8 @@ abstract class DBObject implements iDisplay
|
|||||||
$oUniquenessQuery->AddConditionForInOperatorUsingParam('finalclass', $aChildClassesWithRuleDisabled, false);
|
$oUniquenessQuery->AddConditionForInOperatorUsingParam('finalclass', $aChildClassesWithRuleDisabled, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$oUniquenessQuery->AllowAllData();
|
||||||
|
|
||||||
return $oUniquenessQuery;
|
return $oUniquenessQuery;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user