fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in paulis/processmaker/PM-2313 (pull request #1968)

Browse Source 
PM-2313: I solved the issue when I created install/newSite with Drop database if exists deschecked didn't create a workspace
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-21 12:39:05 -04:00
parent ab1a960c45 cd5dbd0e01
commit fb9e3748f8
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/classes/class.Installer.php
View File

@@ -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
);
}

4
workflow/engine/controllers/newSiteProxy.php
View File

@@ -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;