diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php index 94f7d6b60..69b2260f4 100755 --- a/workflow/engine/controllers/newSiteProxy.php +++ b/workflow/engine/controllers/newSiteProxy.php @@ -49,6 +49,9 @@ class newSiteProxy extends HttpProxyController } else { //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']; } } else { $this->error = true; diff --git a/workflow/engine/templates/setup/newSite.js b/workflow/engine/templates/setup/newSite.js index 11a683b42..358d80284 100755 --- a/workflow/engine/templates/setup/newSite.js +++ b/workflow/engine/templates/setup/newSite.js @@ -171,7 +171,12 @@ Ext.onReady(function(){ Ext.Msg.alert(_('ID_FAILURE'), _('ID_SERVER_REPORTED') + ':' + a.response.status+' '+a.response.statusText); } if (a.failureType === Ext.form.Action.SERVER_INVALID){ - Ext.Msg.alert(_('ID_WARNING'), _('NEW_SITE_NOT_AVAILABLE')); + var text = JSON.parse(a.response.responseText); + if (typeof text.message) { + Ext.Msg.alert(_('ID_ERROR'), _('ID_MYSQL_ERROR', text.message)); + } else { + Ext.Msg.alert(_('ID_WARNING'), _('NEW_SITE_NOT_AVAILABLE')); + } } } });