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

// don't return errors twice on module installation on installer

Browse Source
This commit is contained in:
Rémi Gaillard
2013-03-29 17:05:13 +01:00
parent e3ba526625
commit 9680d4987b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/console/process.php
+10
View File
@@ -97,6 +97,8 @@ class InstallControllerConsoleProcess extends InstallControllerConsole
$this->printErrors(); $this->printErrors();
if (!$this->processInstallModules()) if (!$this->processInstallModules())
$this->printErrors(); $this->printErrors();
if (!$this->processInstallAddonsModules())
$this->printErrors();
if (!$this->processInstallFixtures()) if (!$this->processInstallFixtures())
$this->printErrors(); $this->printErrors();
if (!$this->processInstallTheme()) if (!$this->processInstallTheme())
@@ -265,5 +267,13 @@ class InstallControllerConsoleProcess extends InstallControllerConsole
return true; return true;
} }
/**
* PROCESS : installModulesAddons
* Install modules from addons
*/
public function processInstallAddonsModules()
{
return $this->model_install->installModulesAddons();
}
} }
install-dev/models/install.php
+1 -2
View File
@@ -621,8 +621,7 @@ class InstallModelInstall extends InstallAbstractModel
} }
$errors = array(); $errors = array();
foreach ($modules as $module_name) foreach ($modules as $module_name)
if (!$this->installModules($module_name)) $this->installModules($module_name);
$errors[] = $this->language->l('Cannot install module "%s"', $module_name);
if ($errors) if ($errors)
{ {