From b504830f45b8560f672e904ff8f5344a8a22102b Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Tue, 6 May 2014 13:54:45 +0000 Subject: [PATCH] CSV export (from the toolkit menu) now displays an asynchronous page, to better cope with a huge number of objects (> 10000) SVN:trunk[3143] --- application/displayblock.class.inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index ee99e5f21..bf3b43aee 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -784,6 +784,7 @@ class DisplayBlock $sChecked = ''; } +/* $sCSVData = cmdbAbstractObject::GetSetAsCSV($this->m_oSet, array('fields_advanced' => $bAdvancedMode)); $sCharset = MetaModel::GetConfig()->Get('csv_file_default_charset'); if ($sCharset == 'UTF-8') @@ -812,6 +813,8 @@ class DisplayBlock $sCharsetNotice = ''; } +*/ + $sCharsetNotice = false; $sHtml .= "
"; $sHtml .= ''; $sHtml .= ''; @@ -827,9 +830,10 @@ class DisplayBlock } $sHtml .= ""; - $sHtml .= "\n"; + $oPage->add_ready_script("$.post('$sDownloadLink', {}, function(data) { $('#csv_content').html(data); $('#csv_content_loading').hide(); $('#csv_content').show();} );"); break; case 'modify':