From 870ba2203bc784f82b16731fc5ece0ecfbad5348 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Fri, 11 Jun 2010 15:46:54 +0000 Subject: [PATCH] Backport 30755 Don't try to include js, that variable isn't there anymore > - Special handling for the upload (step 30) to do a full form submit --- .../inc/class.importexport_definitions_ui.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php index dec2db1119..ee6b6392fb 100644 --- a/importexport/inc/class.importexport_definitions_ui.inc.php +++ b/importexport/inc/class.importexport_definitions_ui.inc.php @@ -184,6 +184,10 @@ class importexport_definitions_ui $button = array_keys($content['button']); $content['button'] = array($button[0] => 'pressed'); } + // Override next button on step 30 + if($content['step'] == '30') { + $this->etpl->set_cell_attribute('button[next]', 'onclick', ''); + } // post process submitted step if($content['step']) { @@ -243,10 +247,6 @@ class importexport_definitions_ui $this->response->addAssign('exec[button][cancel]','style.display', 'none'); } $this->response->addAssign('contentbox', 'innerHTML', $html); - if (isset($GLOBALS['egw']->js) && $GLOBALS['egw']->js->body['onLoad']) - { - $this->response->addScript($GLOBALS['egw']->js->body['onLoad']); - } $this->response->addAssign('picturebox', 'style.display', 'none'); $this->response->addScript("set_style_by_class('div','popupManual','display','inline');");