From eb18378e175ab1073bb31dbeb744101088bac8a3 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Wed, 22 Aug 2012 09:31:27 +0000 Subject: [PATCH] [-] BO: Fix #PSCFV-3711 --- controllers/admin/AdminShopController.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index f1a9b2c55..a334b4fbf 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -557,6 +557,9 @@ class AdminShopControllerCore extends AdminController */ public function processAdd() { + if (!Tools::getValue('categoryBox')) + $this->errors[] = $this->l('You need to select at least the root category.'); + if (Tools::isSubmit('id_category_default')) $_POST['id_category'] = (int)Tools::getValue('id_category_default'); /* Checking fields validity */ @@ -597,9 +600,6 @@ class AdminShopControllerCore extends AdminController return; } - // datas to import - $import_data = Tools::getValue('importData'); - // specific import for stock if (isset($import_data['stock_available']) && isset($import_data['product']) && Tools::isSubmit('useImportData')) { @@ -608,9 +608,7 @@ class AdminShopControllerCore extends AdminController StockAvailable::copyStockAvailableFromShopToShop($id_src_shop, $object->id); } - // if we import datas from another shop, we do not update the shop categories - if (!isset($import_data['category'])) - Category::updateFromShop(Tools::getValue('categoryBox'), $object->id); + Category::updateFromShop(Tools::getValue('categoryBox'), $object->id); return $object; }