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

N°1915 import : fix cannot create object with value for field that is readonly in modification

Browse Source 
Last fix (523e19528e) was not a correct solution
This commit is contained in:
Pierre Goiffon
2018-12-31 12:10:07 +01:00
parent 523e19528e
commit 636a3940cd
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/bulkchange.class.inc.php
View File

@@ -336,7 +336,6 @@ class BulkChange
* @param \DBObject $oTargetObj
* @param array $aRowData
* @param array $aErrors
* @param bool $bIsNewObject
*
* @return array
* @throws \CoreException
@@ -345,7 +344,7 @@ class BulkChange
* @throws \MySQLException
* @throws \MySQLHasGoneAwayException
*/
protected function PrepareObject(&$oTargetObj, $aRowData, &$aErrors, $bIsNewObject = false)
protected function PrepareObject(&$oTargetObj, $aRowData, &$aErrors)
{
$aResults = array();
$aErrors = array();
@@ -490,7 +489,7 @@ class BulkChange
if (!$oAttDef->IsWritable() && in_array($sAttCode, $this->m_aReconcilKeys)){ continue; }
$aReasons = array();
$iFlags = ($bIsNewObject)
$iFlags = ($oTargetObj->IsNew())
? $oTargetObj->GetInitialStateAttributeFlags($sAttCode, $aReasons)
: $oTargetObj->GetAttributeFlags($sAttCode, $aReasons);
if ( (($iFlags & OPT_ATT_READONLY) == OPT_ATT_READONLY) && ( $oTargetObj->Get($sAttCode) != $aRowData[$iCol]) )
@@ -700,7 +699,7 @@ class BulkChange
}
}
$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors, true);
$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
if (count($aErrors) > 0)
{
@@ -748,7 +747,7 @@ class BulkChange
protected function UpdateObject(&$aResult, $iRow, $oTargetObj, $aRowData, CMDBChange $oChange = null)
{
$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors, false);
$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
// Reporting
//