Merge branch 'saas/3.0' into develop

This commit is contained in:
odain
2022-09-20 16:04:55 +02:00
26 changed files with 1186 additions and 344 deletions

View File

@@ -72,6 +72,7 @@ define('TAG_ATTCODE', 'domains');
class ItopDataTestCase extends ItopTestCase
{
private $iTestOrgId;
// For cleanup
private $aCreatedObjects = array();
@@ -885,7 +886,7 @@ class ItopDataTestCase extends ItopTestCase
}
/**
* Import a consistent set of iTop objects from the specified XML text string
* Import a consistent set of iTop objects from the specified XML text string
* @param string $sXmlDataset
* @param boolean $bSearch If true, a search will be performed on each object (based on its reconciliation keys)
* before trying to import it (existing objects will be updated)