extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Make highlight of non-mapped columns stick around

Browse Source 
- Fix file upload missing if you use previous button
This commit is contained in:
Nathan Gray 2012-09-12 16:43:20 +00:00
parent 411fe5eca6
commit a3cf69c97c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -529,10 +529,6 @@ class importexport_definitions_ui
$button = array_keys($content['button']); $button = array_keys($content['button']);
$content['button'] = array($button[0] => 'pressed'); $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 // post process submitted step
if($content['step']) { if($content['step']) {
@ -556,6 +552,12 @@ class importexport_definitions_ui
// pre precess next step // pre precess next step
$sel_options = $readonlys = $preserv = array(); $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 // Disable finish button if required fields are missing
if(!$content['name'] || !$content['type'] || !$content['plugin']) { if(!$content['name'] || !$content['type'] || !$content['plugin']) {
$GLOBALS['egw']->js->set_onload("disable_button('exec[button][finish]');"); $GLOBALS['egw']->js->set_onload("disable_button('exec[button][finish]');");

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

@ -347,7 +347,7 @@ class importexport_wizard_basic_import_csv
$j++; $j++;
} }
$sel_options['field_mapping'] = array('--NONE--' => lang('none')) + $this->mapping_fields; $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']); unset ($preserv['button']);
return $this->step_templates[$content['step']]; return $this->step_templates[$content['step']];
} }