From fad77fb9fa9f39e9884b4d279308c91285697d5c Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Tue, 16 Oct 2012 14:47:22 +0000 Subject: [PATCH] CSV import: added a flag to disable the history tab (too long to display, when the feature is heavily used), reintegrated from trunk SVN:1.2[2265] --- core/config.class.inc.php | 8 ++++++++ pages/csvimport.php | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/core/config.class.inc.php b/core/config.class.inc.php index abd480efc..2fa6f1cd7 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -197,6 +197,14 @@ class Config 'source_of_value' => '', 'show_in_conf_sample' => false, ), + 'csv_import_history_display' => array( + 'type' => 'bool', + 'description' => 'Display the history tab in the import wizard', + 'default' => true, + 'value' => true, + 'source_of_value' => '', + 'show_in_conf_sample' => true, + ), 'access_mode' => array( 'type' => 'integer', 'description' => 'Combination of flags (ACCESS_USER_WRITE | ACCESS_ADMIN_WRITE, or ACCESS_FULL)', diff --git a/pages/csvimport.php b/pages/csvimport.php index 6f1ce3cd4..2ec7d7df9 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -1405,14 +1405,18 @@ $('#select_template_class').change( function() { EOF ); + if (Utils::GetConfig()->Get('csv_import_history_display')) + { $oPage->SetCurrentTabContainer('tabs1'); $oPage->SetCurrentTab(Dict::S('UI:History:BulkImports')); BulkChange::DisplayImportHistory($oPage); + } } switch($iStep) { case 10: + // Case generated by BulkChange::DisplayImportHistory $iChange = (int)utils::ReadParam('changeid', 0); BulkChange::DisplayImportHistoryDetails($oPage, $iChange); break;