diff --git a/workflow/engine/classes/class.Installer.php b/workflow/engine/classes/class.Installer.php index 682aa328f..072efabd3 100755 --- a/workflow/engine/classes/class.Installer.php +++ b/workflow/engine/classes/class.Installer.php @@ -697,8 +697,8 @@ class Installer } } $rt['ao']['ao_db_wf'] = $this->check_db($this->options['advanced']['ao_db_wf']); - $rt['ao']['ao_db_rb'] = $this->check_db($this->options['advanced']['ao_db_rb']); - $rt['ao']['ao_db_rp'] = $this->check_db($this->options['advanced']['ao_db_rp']); + //$rt['ao']['ao_db_rb'] = $this->check_db($this->options['advanced']['ao_db_rb']); + //$rt['ao']['ao_db_rp'] = $this->check_db($this->options['advanced']['ao_db_rp']); return $rt; } diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php index 69b2260f4..ff263c879 100755 --- a/workflow/engine/controllers/newSiteProxy.php +++ b/workflow/engine/controllers/newSiteProxy.php @@ -50,8 +50,8 @@ class newSiteProxy extends HttpProxyController //the site does not available $this->error = true; $this->message = $result['result']['database']['ao']['ao_db_wf']['message']; - $this->message .= ', ' . $result['result']['database']['ao']['ao_db_rb']['message']; - $this->message .= ', ' . $result['result']['database']['ao']['ao_db_rp']['message']; + //$this->message .= ', ' . $result['result']['database']['ao']['ao_db_rb']['message']; + //$this->message .= ', ' . $result['result']['database']['ao']['ao_db_rp']['message']; } } else { $this->error = true; diff --git a/workflow/engine/templates/setup/newSite.js b/workflow/engine/templates/setup/newSite.js index b023f69d1..44d09ecee 100755 --- a/workflow/engine/templates/setup/newSite.js +++ b/workflow/engine/templates/setup/newSite.js @@ -156,8 +156,8 @@ Ext.onReady(function(){ success: function(f,a){ nwTitle =formNewSite.getForm().findField('NW_TITLE').getValue(); aoDbWf =formNewSite.getForm().findField('AO_DB_WF').getValue(); - aoDbRb =aoDbWf; - aoDbRp =aoDbWf; + aoDbRb =aoDbWf; + aoDbRp =aoDbWf; nwUsername =formNewSite.getForm().findField('NW_USERNAME').getValue(); nwPassword =formNewSite.getForm().findField('NW_PASSWORD').getValue(); nwPassword2=formNewSite.getForm().findField('NW_PASSWORD2').getValue(); @@ -172,7 +172,7 @@ Ext.onReady(function(){ } if (a.failureType === Ext.form.Action.SERVER_INVALID){ var text = JSON.parse(a.response.responseText); - if (typeof text.message) { + if (typeof(text.message) != 'undefined') { Ext.Msg.alert(_('ID_ERROR'), _('ID_MYSQL_ERROR', text.message)); } else { Ext.Msg.alert(_('ID_WARNING'), _('NEW_SITE_NOT_AVAILABLE'));