mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts: # core/dbobject.class.php # datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php # lib/composer/autoload_files.php # lib/composer/autoload_real.php # lib/composer/autoload_static.php # pages/UI.php # tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
This commit is contained in:
@@ -18,8 +18,8 @@ use Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreateHelper;
|
||||
use Combodo\iTop\Application\UI\Base\Layout\Object\ObjectSummary;
|
||||
use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory;
|
||||
use Combodo\iTop\Controller\AbstractController;
|
||||
use Combodo\iTop\Service\Router\Router;
|
||||
use Combodo\iTop\Service\Base\ObjectRepository;
|
||||
use Combodo\iTop\Service\Router\Router;
|
||||
use CoreCannotSaveObjectException;
|
||||
use DeleteException;
|
||||
use Dict;
|
||||
@@ -428,6 +428,8 @@ JS;
|
||||
'transaction_id' => $sTransactionId,
|
||||
],
|
||||
]);
|
||||
|
||||
$oObj->CheckChangedExtKeysValues();
|
||||
$oObj->DBInsertNoReload();
|
||||
|
||||
|
||||
@@ -632,6 +634,8 @@ JS;
|
||||
throw new CoreCannotSaveObjectException(array('id' => $oObj->GetKey(), 'class' => $sClass, 'issues' => $aErrors));
|
||||
}
|
||||
|
||||
$oObj->CheckChangedExtKeysValues();
|
||||
|
||||
// Transactions are now handled in DBUpdate
|
||||
$oObj->SetContextSection('temporary_objects', [
|
||||
'finalize' => [
|
||||
|
||||
Reference in New Issue
Block a user