composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

CSV import: added a flag to disable the history tab (too long to display, when the feature is heavily used), reintegrated from trunk

Browse Source 
SVN:1.2.1[2266]
This commit is contained in:
Romain Quetiez
2012-10-16 14:47:57 +00:00
parent aa9933a6b3
commit db640fde59
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/config.class.inc.php
View File

@@ -197,6 +197,14 @@ class Config
'source_of_value' => '', 'source_of_value' => '',
'show_in_conf_sample' => false, '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( 'access_mode' => array(
'type' => 'integer', 'type' => 'integer',
'description' => 'Combination of flags (ACCESS_USER_WRITE | ACCESS_ADMIN_WRITE, or ACCESS_FULL)', 'description' => 'Combination of flags (ACCESS_USER_WRITE | ACCESS_ADMIN_WRITE, or ACCESS_FULL)',

4
pages/csvimport.php
View File

@@ -1402,14 +1402,18 @@ $('#select_template_class').change( function() {
EOF EOF
); );
if (Utils::GetConfig()->Get('csv_import_history_display'))
{
$oPage->SetCurrentTabContainer('tabs1'); $oPage->SetCurrentTabContainer('tabs1');
$oPage->SetCurrentTab(Dict::S('UI:History:BulkImports')); $oPage->SetCurrentTab(Dict::S('UI:History:BulkImports'));
BulkChange::DisplayImportHistory($oPage); BulkChange::DisplayImportHistory($oPage);
}
} }
switch($iStep) switch($iStep)
{ {
case 10: case 10:
// Case generated by BulkChange::DisplayImportHistory
$iChange = (int)utils::ReadParam('changeid', 0); $iChange = (int)utils::ReadParam('changeid', 0);
BulkChange::DisplayImportHistoryDetails($oPage, $iChange); BulkChange::DisplayImportHistoryDetails($oPage, $iChange);
break; break;