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

N°2163 DB*Tracked methods : modifications after review with Romain

Browse Source 
Previous commit : 24eb82d1
Use \CMDBObject::SetTrackInfo
Move \CMDBObject::SetCurrentChange calls at the top most level of the stacks
Restore old behaviors that were removed in previous commit
This commit is contained in:
Pierre Goiffon
2019-11-25 09:41:20 +01:00
parent 2f2d9547b7
commit 0ee77d8c88
13 changed files with 39 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/cmdbabstract.class.inc.php
View File

@@ -4433,7 +4433,7 @@ EOF
*
* @param \WebPage $oP
* @param $sClass
* @param $aObjects
* @param \DBObject[] $aObjects
* @param $bPreview
* @param $sCustomOperation
* @param array $aContextData
@@ -4453,7 +4453,7 @@ EOF
}
else
{
$oObj->DBDelete();
$oObj->DBDelete($oDeletionPlan);
}
}

18
application/loginwebpage.class.inc.php
View File

@@ -786,7 +786,13 @@ class LoginWebPage extends NiceWebPage
$oPerson = null;
try
{
/** @var Person $oPerson */
$sOrigin = 'External User provisioning';
if (isset($_SESSION['login_mode']))
{
$sOrigin .= " ({$_SESSION['login_mode']})";
}
CMDBObject::SetTrackOrigin($sOrigin);
$oPerson = MetaModel::NewObject('Person');
$oPerson->Set('first_name', $sFirstName);
$oPerson->Set('name', $sLastName);
@@ -801,16 +807,6 @@ class LoginWebPage extends NiceWebPage
{
$oPerson->Set($sAttCode, $sValue);
}
/** @var CMDBChange $oMyChange */
$oMyChange = MetaModel::NewObject('CMDBChange');
$oMyChange->Set("date", time());
$sOrigin = 'External User provisioning';
if (isset($_SESSION['login_mode']))
{
$sOrigin .= " ({$_SESSION['login_mode']})";
}
$oMyChange->Set('userinfo', $sOrigin);
$oPerson::SetCurrentChange($oMyChange);
$oPerson->DBInsert();
}
catch (Exception $e)