From 2e311410b231b11a58a532f0ff0d365a6fb77f24 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Wed, 18 Sep 2013 17:02:00 +0200 Subject: [PATCH] [*] BO : Set import entity in cookie (#PSCFV-8214) --- controllers/admin/AdminImportController.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index cc6e3fa89..5a1136499 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -464,9 +464,15 @@ class AdminImportControllerCore extends AdminController // adds fancybox $this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen'); $this->addJqueryPlugin(array('fancybox')); + $entity_selected = 0; if (isset($this->entities[$this->l(Tools::ucfirst(Tools::getValue('import_type')))])) + { $entity_selected = $this->entities[$this->l(Tools::ucfirst(Tools::getValue('import_type')))]; + $this->context->cookie->entity_selected = $entity_selected; + } + elseif(isset($this->context->cookie->entity_selected)) + $entity_selected = (int)$this->context->cookie->entity_selected; $this->tpl_form_vars = array( 'module_confirmation' => (Tools::getValue('import')) && (isset($this->warnings) && !count($this->warnings)), @@ -500,6 +506,9 @@ class AdminImportControllerCore extends AdminController for ($i = 0; $i < $nb_table; $i++) $data[$i] = $this->generateContentTable($i, $nb_column, $handle, $this->separator); + if ($entity_selected = (int)Tools::getValue('entity')) + $this->context->cookie->entity_selected = $entity_selected; + $this->tpl_view_vars = array( 'import_matchs' => Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'import_match'), 'fields_value' => array(