From 51518f6cff71fa662a078e58e25c5136749b89fd Mon Sep 17 00:00:00 2001 From: fabianwolf Date: Mon, 7 Mar 2016 10:18:58 +0100 Subject: [PATCH 1/2] Initial DB Validation fix Install Check if Form is only refreshed. If so don't validate DB. --- Core/Frameworks/BaikalAdmin/Controller/Install/Database.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php b/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php index d3a1f8b..ce31093 100644 --- a/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php +++ b/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php @@ -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) { From 385185c3c7b93985e06d8a9ee5f7c6d530a9c3fa Mon Sep 17 00:00:00 2001 From: fabianwolf Date: Mon, 7 Mar 2016 10:20:13 +0100 Subject: [PATCH 2/2] Initial DB Validation fix System Settings Check if Form is only refreshed. If so don't validate DB. --- Core/Frameworks/BaikalAdmin/Controller/Settings/System.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php b/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php index c369277..b681e8e 100644 --- a/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php +++ b/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php @@ -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 { } } } -} \ No newline at end of file +}