forks/baikal
1
0
Fork 0
Code Releases Activity

Merge pull request #1 from fabianwolf/db_validation_fix

Browse source 
Db validation fix
This commit is contained in:
fabianwolf 2016-03-12 21:12:26 +01:00
commit 52c896d4d9
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,9 @@ class Database extends \Flake\Core\Controller {
}
public function validateConnection($oForm, $oMorpho) {
if($oForm->refreshed()){
return TRUE;
}
$bMySQLEnabled = $oMorpho->element("PROJECT_DB_MYSQL")->value();
if($bMySQLEnabled) {

5
Core/Frameworks/BaikalAdmin/Controller/Settings/System.php
View file

@ -80,6 +80,9 @@ class System extends \Flake\Core\Controller {
}
public function validationHook(\Formal\Form $oForm, \Formal\Form\Morphology $oMorpho) {
if($oForm->refreshed()){
return TRUE;
}
if(intval($oForm->modelInstance()->get("PROJECT_DB_MYSQL")) === 1) {
# We have to check the MySQL connection
@ -115,4 +118,4 @@ class System extends \Flake\Core\Controller {
}
}
}
}
}