Merge branch 'master' of bitbucket.org:richardnoel/processmaker

This commit is contained in:
Richard Yujra
2015-04-27 10:08:20 -04:00

View File

@@ -207,10 +207,10 @@ Ext.onReady(function(){
Ext.Ajax.request({
url: 'checkDatabases',
success: function(response){
var existMsg = '<span style="color: red;">' + _('ID_EXIST') + '</span>';
var noExistsMsg = '<span style="color: green;">' + _('ID_NO_EXIST') + '</span>';
var existMsg = '<span style="color: red;">' + _('ID_NOT_AVAILABLE_DATABASE') + '</span>';
var noExistsMsg = '<span style="color: green;">' + _('ID_AVAILABLE_DATABASE') + '</span>';
var response = Ext.util.JSON.decode(response.responseText);
Ext.get('wfDatabaseSpan').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg);
Ext.get('database_message').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg);
var dbFlag = ((!response.wfDatabaseExists) || Ext.getCmp('deleteDB').getValue());
wizard.onClientValidation(4, dbFlag);
@@ -784,7 +784,7 @@ Ext.onReady(function(){
}),
{
xtype : 'textfield',
fieldLabel: _('ID_WF_DATABASE_NAME') + ' <span id="wfDatabaseSpan"></span>',
fieldLabel: _('ID_WF_DATABASE_NAME'),
id : 'wfDatabase',
value :'wf_workflow',
allowBlank : false,
@@ -799,6 +799,10 @@ Ext.onReady(function(){
wizard.onClientValidation(4, false);
}}
},
{
xtype : 'displayfield',
id : 'database_message'
},
new Ext.form.Checkbox({
boxLabel : _('ID_DELETE_DATABASES'),
id : 'deleteDB',