From 6acebca8fa380e1b779d0e7aa9095aa0e2660312 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 23 Sep 2013 21:04:55 +0200 Subject: [PATCH] [-] BO : fix postProcess override on AdminImportController When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details". Default case of switch is never used. --- controllers/admin/AdminImportController.php | 29 ++++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 0a69a5bb4..8689f5f37 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -2764,19 +2764,22 @@ class AdminImportControllerCore extends AdminController $this->supplierImport(); $this->clearSmartyCache(); break; - // @since 1.5.0 - case $this->entities[$import_type = $this->l('Supply Orders')]: - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) - $this->supplyOrdersImport(); - break; - // @since 1.5.0 - case $this->entities[$import_type = $this->l('Supply Order Details')]: - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) - $this->supplyOrdersDetailsImport(); - break; - default: - $this->errors[] = $this->l('Please select what you would like to import'); } + + // @since 1.5.0 + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) + switch ((int)Tools::getValue('entity')) + { + case $this->entities[$import_type = $this->l('Supply Orders')]: + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) + $this->supplyOrdersImport(); + break; + case $this->entities[$import_type = $this->l('Supply Order Details')]: + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) + $this->supplyOrdersDetailsImport(); + break; + } + if ($import_type !== false) { $log_message = sprintf($this->l('%s import'), $import_type); @@ -2843,4 +2846,4 @@ class AdminImportControllerCore extends AdminController die; } } -} \ No newline at end of file +}