Merge code github > bitbucket 2014-05-23 16:35

This commit is contained in:
Julio Cesar Laura
2014-05-23 16:32:18 -04:00
75 changed files with 2274 additions and 724 deletions

View File

@@ -554,22 +554,27 @@ function saveProcess()
{
var projectType = Ext.getCmp('newProjectWin')._projectType;
Ext.getCmp('newProcessForm').getForm().submit( {
url : '../processProxy/saveProcess?type=' + projectType,
waitMsg : _('ID_SAVING_PROCESS'),
waitTitle : " ",
timeout : 36000,
success : function(obj, resp) {
if (projectType == 'classicProject') {
location.href = 'processes_Map?PRO_UID='+resp.result.PRO_UID;
} else {
location.href = '../designer?prj_uid='+resp.result.PRO_UID;
}
},
failure: function(obj, resp) {
PMExt.error( _('ID_ERROR'), resp.result.msg);
Ext.getCmp('PRO_TITLE').setValue((Ext.getCmp('PRO_TITLE').getValue()).trim());
if (Ext.getCmp('newProcessForm').getForm().isValid()) {
Ext.getCmp('newProcessForm').getForm().submit({
url : '../processProxy/saveProcess?type=' + projectType,
waitMsg : _('ID_SAVING_PROCESS'),
waitTitle : " ",
timeout : 36000,
success : function(obj, resp) {
if (projectType == 'classicProject') {
location.href = 'processes_Map?PRO_UID='+resp.result.PRO_UID;
} else {
location.href = '../designer?prj_uid='+resp.result.PRO_UID;
}
},
failure: function(obj, resp) {
PMExt.error( _('ID_ERROR'), resp.result.msg);
}
});
} else {
PMExt.error( _('ID_ERROR'), _('ID_INVALID_PROCESS_NAME'));
}
});
}
function doSearch(){
@@ -1171,7 +1176,7 @@ function activeDeactive(){
store.reload();
var activator = Ext.getCmp('activator');
activator.setDisabled(true);
activator.setText('Status');
activator.setText(_('ID_STATUS'));
activator.setIcon('');
},
failure: function ( result, request) {
@@ -1207,7 +1212,7 @@ function enableDisableDebug()
store.reload();
var activator = Ext.getCmp('activator');
activator.setDisabled(true);
activator.setText('Status');
activator.setText(_('ID_STATUS'));
activator.setIcon('');
},
failure: function ( result, request) {