extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 08:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backport 32258 - Fix bug preventing unsetting a field mapping

Browse Source 
- Don't re-resize popup window (Fix for IE unable to resize?)
This commit is contained in:
Nathan Gray 2010-09-23 19:43:42 +00:00
parent c34a7c53b9
commit 61a0d1b169
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
View File

@ -100,7 +100,7 @@ class importexport_wizard_basic_import_csv
$content['step'] = 'wizard_step30';
$preserv = $content;
unset ($preserv['button']);
$GLOBALS['egw']->js->set_onload("xajax_eT_wrapper_init();");
//$GLOBALS['egw']->js->set_onload("xajax_eT_wrapper_init();");
return $this->step_templates[$content['step']];
}
@ -187,9 +187,10 @@ class importexport_wizard_basic_import_csv
unset($content['field_mapping'][0]);
if(is_array($content['field_conversion'])) unset($content['field_conversion'][0]);
foreach(array('field_mapping', 'field_conversion') as $field) {
ksort($content[$field]);
foreach($content[$field] as $key => $value)
{
if($value) {
if($value && $value != '--NONE--') {
$content[$field][$key-1] = $content[$field][$key];
}
unset($content[$field][$key]);
@ -199,7 +200,6 @@ class importexport_wizard_basic_import_csv
foreach($content['field_conversion'] as $field => $convert) {
if(!trim($convert)) unset($content['field_conversion'][$field]);
}
switch (array_search('pressed', $content['button']))
{
case 'next':
@ -248,7 +248,7 @@ class importexport_wizard_basic_import_csv
$content['field_mapping'][] = $content['field_conversion'][] = '';
$j++;
}
$sel_options['field_mapping'] = array('' => lang('none')) + $this->mapping_fields;
$sel_options['field_mapping'] = array('--NONE--' => lang('none')) + $this->mapping_fields;
$preserv = $content;
unset ($preserv['button']);
return $this->step_templates[$content['step']];