mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
- Make highlight of non-mapped columns stick around
- Fix file upload missing if you use previous button
This commit is contained in:
parent
411fe5eca6
commit
a3cf69c97c
@ -529,10 +529,6 @@ class importexport_definitions_ui
|
||||
$button = array_keys($content['button']);
|
||||
$content['button'] = array($button[0] => 'pressed');
|
||||
}
|
||||
// Override next button on step 21, to do a regular submit for the file upload
|
||||
if($content['step'] == 'wizard_step21') {
|
||||
$this->etpl->set_cell_attribute('button[next]', 'onclick', '');
|
||||
}
|
||||
|
||||
// post process submitted step
|
||||
if($content['step']) {
|
||||
@ -556,6 +552,12 @@ class importexport_definitions_ui
|
||||
// pre precess next step
|
||||
$sel_options = $readonlys = $preserv = array();
|
||||
|
||||
// Override next button on step 30, to do a regular submit for the file upload
|
||||
if($next_step == 'wizard_step30')
|
||||
{
|
||||
$this->etpl->set_cell_attribute('button[next]', 'onclick', '');
|
||||
}
|
||||
|
||||
// Disable finish button if required fields are missing
|
||||
if(!$content['name'] || !$content['type'] || !$content['plugin']) {
|
||||
$GLOBALS['egw']->js->set_onload("disable_button('exec[button][finish]');");
|
||||
|
@ -347,7 +347,7 @@ class importexport_wizard_basic_import_csv
|
||||
$j++;
|
||||
}
|
||||
$sel_options['field_mapping'] = array('--NONE--' => lang('none')) + $this->mapping_fields;
|
||||
$GLOBALS['egw']->js->set_onload('$j("option[value=\'--NONE--\']:selected").closest("tr").effect("highlight",{},10000);');
|
||||
$GLOBALS['egw']->js->set_onload('$j("option[value=\'--NONE--\']:selected").closest("tr").animate({backgroundColor: "#ffff99"}, 1000);');
|
||||
unset ($preserv['button']);
|
||||
return $this->step_templates[$content['step']];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user