From 1a71d8e87658991462ab0cafa06c0d4907982c1e Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Tue, 21 Apr 2015 11:12:45 -0400 Subject: [PATCH 1/2] PM-2313: I solved the issue when I created install/newSite with Drop database if exists deschecked didn't create a workspace --- workflow/engine/classes/class.Installer.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.Installer.php b/workflow/engine/classes/class.Installer.php index bc777e008..f28892519 100755 --- a/workflow/engine/classes/class.Installer.php +++ b/workflow/engine/classes/class.Installer.php @@ -104,7 +104,16 @@ class Installer $result['name']['message'] = ($result['isset']) ? 'Workspace already exist' : $result['name']['message']; $result['name']['status'] = ($result['isset']) ? false : $result['name']['status']; //print_r($result); - return Array('created' => G::var_compare(true, $result['path_data'], $result['database']['connection'], $result['name']['status'], $result['database']['version'], $result['database']['ao']['ao_db_wf']['status'], $result['database']['ao']['ao_db_rb']['status'], $result['database']['ao']['ao_db_rp']['status'], $result['admin']['username'], (($result['isset']) ? false : true), $result['admin']['password']), 'result' => $result + return Array('created' => G::var_compare(true, + $result['path_data'], + $result['database']['connection'], + $result['name']['status'], + $result['database']['version'], + $result['database']['ao']['ao_db_wf']['status'], + $result['admin']['username'], + (($result['isset']) ? false : true), + $result['admin']['password']), + 'result' => $result ); } From cd5dbd0e01a42256c7e16fb02398c3d29ee44a5d Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Tue, 21 Apr 2015 12:16:13 -0400 Subject: [PATCH 2/2] I corrected a problem when the workspace exists --- workflow/engine/controllers/newSiteProxy.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php index 5a5d0ae0b..807ecf4d4 100755 --- a/workflow/engine/controllers/newSiteProxy.php +++ b/workflow/engine/controllers/newSiteProxy.php @@ -12,12 +12,13 @@ class newSiteProxy extends HttpProxyController public function testingNW ($params) { if (isset( $_POST['NW_TITLE'] )) { $action = (isset( $_POST['action'] )) ? trim( $_POST['action'] ) : 'test'; + $ao_db_drop = (isset( $_POST['AO_DB_DROP'] )) ? true : false; G::LoadClass( 'Installer' ); //G::LoadClass( 'json' ); $name = trim( $_POST['NW_TITLE'] ); $inst = new Installer(); - if ($inst->isset_site($name)) { + if ($inst->isset_site($name) && $ao_db_drop !==true) { $this->error = true; return; } @@ -25,7 +26,6 @@ class newSiteProxy extends HttpProxyController $pass = (isset( $_POST['NW_PASSWORD'] )) ? $_POST['NW_PASSWORD'] : 'admin'; $pass1 = (isset( $_POST['NW_PASSWORD2'] )) ? $_POST['NW_PASSWORD2'] : 'admin'; - $ao_db_drop = (isset( $_POST['AO_DB_DROP'] )) ? true : false; $ao_db_wf = (isset( $_POST['AO_DB_WF'] )) ? $_POST['AO_DB_WF'] : false; $ao_db_rb = (isset( $_POST['AO_DB_RB'] )) ? $_POST['AO_DB_RB'] : false;