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

// Fix bug when fixtures are disabled + move install type (fixtures or not) to configure step

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13069 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-02-07 13:37:37 +00:00
parent c8145aeca4
commit e88d9c39a7
7 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/process.php
+1 -2
View File
@@ -91,7 +91,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
$this->processInstallModules();
else if (Tools::getValue('installFixtures') && !empty($this->session->process_validated['installModules']))
$this->processInstallFixtures();
else if (Tools::getValue('installTheme') && !empty($this->session->process_validated['installFixtures']))
else if (Tools::getValue('installTheme') && !empty($this->session->process_validated['installModules']))
$this->processInstallTheme();
else
{
@@ -220,7 +220,6 @@ class InstallControllerHttpProcess extends InstallControllerHttp
$this->model_install->xml_loader_ids = $this->session->xml_loader_ids;
if (!$this->model_install->installFixtures() || $this->model_install->getErrors())
$this->ajaxJsonAnswer(false, $this->model_install->getErrors());
$this->session->process_validated['installFixtures'] = true;
$this->ajaxJsonAnswer(true);
}