forks/baikal
1
0
Fork 0
Code Releases Activity

Don't move off legacy database form prematurely.

Browse source 
Previously, any form submission would persist the database settings
giving no chance to validate them or edit them.

Toggling the MySQL enabled checkbox also triggered this as that reloaded
the page.
This commit is contained in:
Ben Banfield-Zanin 2020-09-24 21:43:11 +01:00
parent 288f6b61cd
commit e85c0626c1
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
View file

@ -46,12 +46,6 @@ class Database extends \Flake\Core\Controller {
$this->oModel->set('mysql_username', PROJECT_DB_MYSQL_USERNAME); $this->oModel->set('mysql_username', PROJECT_DB_MYSQL_USERNAME);
$this->oModel->set('mysql_password', PROJECT_DB_MYSQL_PASSWORD); $this->oModel->set('mysql_password', PROJECT_DB_MYSQL_PASSWORD);
$this->oModel->set('encryption_key', BAIKAL_ENCRYPTION_KEY); $this->oModel->set('encryption_key', BAIKAL_ENCRYPTION_KEY);
if (defined("BAIKAL_CONFIGURED_VERSION")) {
$oStandardConfig = new \Baikal\Model\Config\Standard();
$oStandardConfig->set("configured_version", BAIKAL_CONFIGURED_VERSION);
$oStandardConfig->persist();
}
} }
$this->oForm = $this->oModel->formForThisModelInstance([ $this->oForm = $this->oModel->formForThisModelInstance([
@ -68,6 +62,18 @@ class Database extends \Flake\Core\Controller {
@unlink(PROJECT_PATH_SPECIFIC . "config.system.php"); @unlink(PROJECT_PATH_SPECIFIC . "config.system.php");
} }
touch(PROJECT_PATH_SPECIFIC . '/INSTALL_DISABLED'); touch(PROJECT_PATH_SPECIFIC . '/INSTALL_DISABLED');
if (defined("BAIKAL_CONFIGURED_VERSION")) {
$oStandardConfig = new \Baikal\Model\Config\Standard();
$oStandardConfig->set("configured_version", BAIKAL_CONFIGURED_VERSION);
$oStandardConfig->persist();
# We've just rolled back the configured version, so reload so that we get to the
# version upgrade page rather than the database is configured message in render below
$sLink = PROJECT_URI . "admin/install/?/database";
\Flake\Util\Tools::redirect($sLink);
exit(0);
}
} }
} }
} }