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

HOR-1357: Al importar un proceso la pagina se queda cargando

Browse Source
This commit is contained in:
mcuiza
2016-06-28 12:43:01 -04:00
parent dcd2aa8982
commit 3f5359c0e6
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
workflow/engine/templates/processes/main.js
View File

@@ -1295,6 +1295,7 @@ function exportImportProcessObjects(typeAction)
fn : function(){}, fn : function(){},
icon : Ext.MessageBox.ERROR icon : Ext.MessageBox.ERROR
}); });
processesGrid.store.reload();
} }
}); });
} }
@@ -1545,6 +1546,7 @@ importProcessExistGroup = function()
fn : function(){}, fn : function(){},
icon : Ext.MessageBox.ERROR icon : Ext.MessageBox.ERROR
}); });
processesGrid.store.reload();
} }
}); });
} }
@@ -1713,29 +1715,42 @@ importProcessExistProcess = function()
success: function(o, resp) { success: function(o, resp) {
var resp_ = Ext.util.JSON.decode(resp.response.responseText); var resp_ = Ext.util.JSON.decode(resp.response.responseText);
var sNewProUid = resp_.sNewProUid; var sNewProUid = resp_.sNewProUid;
if (resp_.catchMessage != '') {
w.close();
Ext.getCmp('importProcessWindow').close()
Ext.MessageBox.show({
title : _('ID_ERROR'),
msg : resp_.catchMessage,
buttons : Ext.MessageBox.OK,
animEl : 'mb9',
fn : function(){},
icon : Ext.MessageBox.ERROR
});
processesGrid.store.reload();
return;
}
if(resp_.isGranularImport) { if(resp_.isGranularImport) {
importProcessGlobal.isGranularImport = resp_.isGranularImport; importProcessGlobal.isGranularImport = resp_.isGranularImport;
importProcessGlobal.objectGranularImport = resp_.objectGranularImport; importProcessGlobal.objectGranularImport = resp_.objectGranularImport;
exportImportProcessObjects('import'); exportImportProcessObjects('import');
} else { } else {
if (resp_.ExistGroupsInDatabase == 0) { if (resp_.ExistGroupsInDatabase == 0) {
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") { if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
if (typeof(resp_.project_type_aux) != "undefined" && resp_.project_type_aux == "NORMAL") { if (typeof(resp_.project_type_aux) != "undefined" && resp_.project_type_aux == "NORMAL") {
importProcessCallbackFile = false; importProcessCallbackFile = false;
} }
var goTo = importProcessCallbackFile ? importProcessCallbackFile : "../designer?prj_uid="; var goTo = importProcessCallbackFile ? importProcessCallbackFile : "../designer?prj_uid=";
openWindowIfIE(goTo + sNewProUid); openWindowIfIE(goTo + sNewProUid);
} else { } else {
window.location.href = "processes_Map?PRO_UID=" + sNewProUid; window.location.href = "processes_Map?PRO_UID=" + sNewProUid;
} }
} } else {
else { affectedGroups = resp_.affectedGroups;
affectedGroups = resp_.affectedGroups; importProcessGlobal.proFileName = resp_.proFileName;
importProcessGlobal.proFileName = resp_.proFileName; importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion;
importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion; importProcessGlobal.sNewProUid = resp_.sNewProUid;
importProcessGlobal.sNewProUid = resp_.sNewProUid; importProcessGlobal.importOption = resp_.importOption;
importProcessGlobal.importOption = resp_.importOption; importProcessExistGroup();
importProcessExistGroup();
} }
} }
}, },
@@ -1751,6 +1766,7 @@ importProcessExistProcess = function()
fn : function(){}, fn : function(){},
icon : Ext.MessageBox.ERROR icon : Ext.MessageBox.ERROR
}); });
processesGrid.store.reload();
} }
}); });
} }
@@ -2031,6 +2047,7 @@ importProcess = function()
fn : function(){}, fn : function(){},
icon : Ext.MessageBox.ERROR icon : Ext.MessageBox.ERROR
}); });
processesGrid.store.reload();
} }
} }
}, },
@@ -2046,6 +2063,7 @@ importProcess = function()
fn : function(){}, fn : function(){},
icon : Ext.MessageBox.ERROR icon : Ext.MessageBox.ERROR
}); });
processesGrid.store.reload();
} }
}); });
} }
@@ -2169,6 +2187,7 @@ importProcessBpmnSubmit = function () {
}, },
icon: Ext.MessageBox.ERROR icon: Ext.MessageBox.ERROR
}); });
processesGrid.store.reload();
} }
}); });
} }