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

Fixed Trac #252: pb when doing a CSV load with no header line.

Browse Source 
SVN:trunk[787]
This commit is contained in:
Denis Flaven
2010-09-07 08:10:49 +00:00
parent de5d345e4e
commit 82bcf663c4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pages/ajax.csvimport.php
View File

@@ -266,8 +266,8 @@ switch($sOperation)
$sSeparator = utils::ReadParam('separator', ',');
$sTextQualifier = utils::ReadParam('qualifier', '"');
$iLinesToSkip = utils::ReadParam('nb_lines_skipped', 0);
$bFirstLineAsHeader = utils::ReadParam('header_line', true);
$sData = stripslashes(utils::ReadParam('csvdata', true));
$bFirstLineAsHeader = utils::ReadParam('header_line', false);
$sData = stripslashes(utils::ReadParam('csvdata', ''));
$sClassName = utils::ReadParam('class_name', '');
$bAdvanced = utils::ReadParam('advanced', false);
$sEncoding = utils::ReadParam('encoding', 'UTF-8');
@@ -281,12 +281,12 @@ switch($sOperation)
else
{
$oPage->add("<table>");
$index = 1;
$aFirstLine = $aData[0]; // Use the first row to determine the number of columns
$iStartLine = 0;
$iNbColumns = count($aFirstLine);
if ($bFirstLineAsHeader)
{ $iStartLine = 1;
{
$iStartLine = 1;
foreach($aFirstLine as $sField)
{
$aHeader[] = $sField;
@@ -306,6 +306,7 @@ switch($sOperation)
$oPage->add('<tr>');
$oPage->add('<th>'.Dict::S('UI:CSVImport:HeaderFields').'</th><th>'.Dict::S('UI:CSVImport:HeaderMappings').'</th><th>&nbsp;</th><th>'.Dict::S('UI:CSVImport:HeaderSearch').'</th><th>'.Dict::S('UI:CSVImport:DataLine1').'</th><th>'.Dict::S('UI:CSVImport:DataLine2').'</th>');
$oPage->add('</tr>');
$index = 1;
foreach($aHeader as $sField)
{
$oPage->add('<tr>');