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

Fixed bug in CSV sync mode (class given by the scope)

Browse Source 
SVN:trunk[1011]
This commit is contained in:
Romain Quetiez
2010-12-06 15:58:37 +00:00
parent cde184e2a3
commit 35fe0b9ef5
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pages/csvimport.php
View File

@@ -252,8 +252,7 @@ try
$sClassName = $oSearch->GetClass(); // If a synchronization scope is set, then the class is fixed !
$oSet = new DBObjectSet($oSearch);
$iCount = $oSet->Count();
$sSynchroClass = 'Server';
DisplaySynchroBanner($oPage, $sSynchroClass, $iCount);
DisplaySynchroBanner($oPage, $sClassName, $iCount);
$sClassesSelect = "<select id=\"select_class_name\" name=\"class_name\"><option value=\"$sClassName\" selected>".MetaModel::GetName($sClassName)."</option>";
$aSynchroUpdate = utils::ReadParam('synchro_update', array());
}
@@ -825,8 +824,7 @@ EOF
$sClassName = $oSearch->GetClass(); // If a synchronization scope is set, then the class is fixed !
$oSet = new DBObjectSet($oSearch);
$iCount = $oSet->Count();
$sSynchroClass = 'Server';
DisplaySynchroBanner($oPage, $sSynchroClass, $iCount);
DisplaySynchroBanner($oPage, $sClassName, $iCount);
$sClassesSelect = "<select id=\"select_class_name\" name=\"class_name\"><option value=\"$sClassName\" selected>".MetaModel::GetName($sClassName)."</option>";
$aSynchroUpdate = utils::ReadParam('synchro_update', array());
}
@@ -1130,11 +1128,10 @@ EOF
if (!empty($sSynchroScope))
{
$oSearch = DBObjectSearch::FromOQL($sSynchroScope);
$sSynchroClass = $oSearch->GetClass();
$sClassName = $oSearch->GetClass();
$oSet = new DBObjectSet($oSearch);
$iCount = $oSet->Count();
$sSynchroClass = 'Server';
DisplaySynchroBanner($oPage, $sSynchroClass, $iCount);
DisplaySynchroBanner($oPage, $sClassName, $iCount);
$aSynchroUpdate = utils::ReadParam('synchro_update', array());
}
@@ -1267,11 +1264,10 @@ EOF
if (!empty($sSynchroScope))
{
$oSearch = DBObjectSearch::FromOQL($sSynchroScope);
$sSynchroClass = $oSearch->GetClass();
$sClassName = $oSearch->GetClass();
$oSet = new DBObjectSet($oSearch);
$iCount = $oSet->Count();
$sSynchroClass = 'Server';
DisplaySynchroBanner($oPage, $sSynchroClass, $iCount);
DisplaySynchroBanner($oPage, $sClassName, $iCount);
$aSynchroUpdate = utils::ReadParam('synchro_update', array());
}
else