dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO: Add display of modules errors on reset #PSCFV-2077

Browse Source
This commit is contained in:
Rémi Gaillard committed 2012-12-04 11:13:06 +01:00
1 parent 3510cc03ab
commit e5ec07f95a
1 file changed
+2
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminModulesController.php
+2
View File
@@ -462,6 +462,7 @@ class AdminModulesControllerCore extends AdminController
} }
else else
$this->errors[] = Tools::displayError('Cannot load module object'); $this->errors[] = Tools::displayError('Cannot load module object');
$this->errors = array_merge($this->errors, $module->getErrors());
} }
else else
$this->errors[] = Tools::displayError('You do not have permission to add here.'); $this->errors[] = Tools::displayError('You do not have permission to add here.');
@@ -688,6 +689,7 @@ class AdminModulesControllerCore extends AdminController
} }
elseif ($echo === false) elseif ($echo === false)
$module_errors[] = array('name' => $name, 'message' => $module->getErrors()); $module_errors[] = array('name' => $name, 'message' => $module->getErrors());
if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && isset(Context::getContext()->tmpOldShop)) if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && isset(Context::getContext()->tmpOldShop))
{ {
Context::getContext()->shop = clone(Context::getContext()->tmpOldShop); Context::getContext()->shop = clone(Context::getContext()->tmpOldShop);