forks/baikal
1
0
Fork 0
Code Releases Activity

Show/hide correct database fields on initial load

Browse source 
On the initial load the form morphology hook is called prior to the
morphology being populated with values from the model. Loading from the
YAML won't always work if we're coming from < 0.7.0.

Loading from the model is safe as:
- The model is initially populated with the YAML
- If legacy config is present then the model is updated with that
- If this isn't the initial load we go down the submitted branch instead
This commit is contained in:
Ben Banfield-Zanin 2020-09-24 21:45:57 +01:00
parent e85c0626c1
commit 4900196f4c
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -215,12 +215,8 @@ class Database extends \Flake\Core\Controller {
if ($oForm->submitted()) { if ($oForm->submitted()) {
$bMySQL = (intval($oForm->postValue("mysql")) === 1); $bMySQL = (intval($oForm->postValue("mysql")) === 1);
} else { } else {
try { // oMorpho won't have the values from the model set on it yet
$configSystem = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml"); $bMySQL = $this->oModel->get("mysql");
} catch (\Exception $e) {
error_log('Error reading baikal.yaml file : ' . $e->getMessage());
}
$bMySQL = $configSystem['database']['mysql'] ?? true;
} }
if ($bMySQL === true) { if ($bMySQL === true) {