From b42a43d47b60d9065430e636dca3da099cb9730d Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Thu, 2 Oct 2014 09:36:32 +0000 Subject: [PATCH] #968 (continued) do not loose the "advanced mode" flag in the interactive display. SVN:trunk[3357] --- application/displayblock.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 4b9efb6c20..92cfd536ee 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -772,7 +772,6 @@ class DisplayBlock $sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv'; $sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($sCsvFile); - $sAjaxLink = $sDownloadLink.'&charset=UTF-8'; $sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.urlencode($this->m_oFilter->serialize()).'&format=csv'; if ($bAdvancedMode) { @@ -784,7 +783,8 @@ class DisplayBlock $sLinkToToggle = $sLinkToToggle.'&advanced=1'; $sChecked = ''; } - + $sAjaxLink = $sDownloadLink.'&charset=UTF-8'; // Includes &fields_advanced=1 if in advanced mode + /* $sCSVData = cmdbAbstractObject::GetSetAsCSV($this->m_oSet, array('fields_advanced' => $bAdvancedMode)); $sCharset = MetaModel::GetConfig()->Get('csv_file_default_charset');