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
This commit is contained in:
rMalie
2012-02-07 13:37:37 +00:00
parent b63c04a22b
commit 85bee87920
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/configure.php
+4
View File
@@ -38,6 +38,7 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
// Save shop configuration
$this->session->shop_name = trim(Tools::getValue('shop_name'));
$this->session->shop_activity = Tools::getValue('shop_activity');
$this->session->install_type = Tools::getValue('db_mode');
$this->session->shop_country = Tools::getValue('shop_country');
$this->session->shop_timezone = Tools::getValue('shop_timezone');
@@ -420,6 +421,9 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
sort($list_activities);
$this->list_activities = $list_activities;
// Install type
$this->install_type = ($this->session->install_type) ? $this->session->install_type : 'full';
$this->displayTemplate('configure');
}
install-dev/controllers/http/database.php
+1 -5
View File
@@ -54,8 +54,6 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
*/
public function processNextStep()
{
$this->session->install_type = Tools::getValue('db_mode');
// Save database config
$this->session->database_server = trim(Tools::getValue('dbServer'));
$this->session->database_name = trim(Tools::getValue('dbName'));
@@ -151,7 +149,7 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
*/
public function display()
{
if (!$this->session->install_type)
if (!$this->session->database_server)
{
if (file_exists(_PS_ROOT_DIR_.'/config/settings.inc.php'))
{
@@ -174,7 +172,6 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
}
$this->database_clear = true;
$this->install_type = 'full';
$this->use_smtp = false;
$this->smtp_server = 'smtp.';
$this->smtp_encryption = 'off';
@@ -192,7 +189,6 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
$this->database_prefix = $this->session->database_prefix;
$this->database_clear = $this->session->database_clear;
$this->install_type = $this->session->install_type;
$this->use_smtp = $this->session->use_smtp;
$this->smtp_server = $this->session->smtp_server;
$this->smtp_encryption = $this->session->smtp_encryption;
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);
}