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

Merged in julceslau/processmaker (pull request #1109)

Browse Source 
PM-823 Error al momento de crear workspaces SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-30 12:56:17 -04:00
parent 8f78081438 848886f424
commit 3cc09c543f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -697,8 +697,8 @@ class Installer
} }
} }
$rt['ao']['ao_db_wf'] = $this->check_db($this->options['advanced']['ao_db_wf']); $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_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_rp'] = $this->check_db($this->options['advanced']['ao_db_rp']);
return $rt; return $rt;
} }

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

@@ -50,8 +50,8 @@ class newSiteProxy extends HttpProxyController
//the site does not available //the site does not available
$this->error = true; $this->error = true;
$this->message = $result['result']['database']['ao']['ao_db_wf']['message']; $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_rb']['message'];
$this->message .= ', ' . $result['result']['database']['ao']['ao_db_rp']['message']; //$this->message .= ', ' . $result['result']['database']['ao']['ao_db_rp']['message'];
} }
} else { } else {
$this->error = true; $this->error = true;

6
workflow/engine/templates/setup/newSite.js
View File

@@ -156,8 +156,8 @@ Ext.onReady(function(){
success: function(f,a){ success: function(f,a){
nwTitle =formNewSite.getForm().findField('NW_TITLE').getValue(); nwTitle =formNewSite.getForm().findField('NW_TITLE').getValue();
aoDbWf =formNewSite.getForm().findField('AO_DB_WF').getValue(); aoDbWf =formNewSite.getForm().findField('AO_DB_WF').getValue();
aoDbRb =aoDbWf; aoDbRb =aoDbWf;
aoDbRp =aoDbWf; aoDbRp =aoDbWf;
nwUsername =formNewSite.getForm().findField('NW_USERNAME').getValue(); nwUsername =formNewSite.getForm().findField('NW_USERNAME').getValue();
nwPassword =formNewSite.getForm().findField('NW_PASSWORD').getValue(); nwPassword =formNewSite.getForm().findField('NW_PASSWORD').getValue();
nwPassword2=formNewSite.getForm().findField('NW_PASSWORD2').getValue(); nwPassword2=formNewSite.getForm().findField('NW_PASSWORD2').getValue();
@@ -172,7 +172,7 @@ Ext.onReady(function(){
} }
if (a.failureType === Ext.form.Action.SERVER_INVALID){ if (a.failureType === Ext.form.Action.SERVER_INVALID){
var text = JSON.parse(a.response.responseText); 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)); Ext.Msg.alert(_('ID_ERROR'), _('ID_MYSQL_ERROR', text.message));
} else { } else {
Ext.Msg.alert(_('ID_WARNING'), _('NEW_SITE_NOT_AVAILABLE')); Ext.Msg.alert(_('ID_WARNING'), _('NEW_SITE_NOT_AVAILABLE'));