fernando/luos
1
0
Fork 0
Code Releases Activity

PM-1417-1368

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-03-07 11:16:18 -04:00
parent a3c0f8714f
commit 4574cd985d
1 changed files with 28 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,8 +479,6 @@ Ext.onReady(function(){
function newProcess(params) function newProcess(params)
{ {
if (winDesigner)
winDesigner.close();
params = typeof params == 'undefined' ? {type:'classicProject'} : params; params = typeof params == 'undefined' ? {type:'classicProject'} : params;
// TODO this variable have hardcoded labels, it must be changed on the future // TODO this variable have hardcoded labels, it must be changed on the future
@@ -589,20 +587,13 @@ function saveProcess()
if (projectType == 'classicProject') { if (projectType == 'classicProject') {
location.href = 'processes_Map?PRO_UID='+resp.result.PRO_UID; location.href = 'processes_Map?PRO_UID='+resp.result.PRO_UID;
} else { } else {
if ( (navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1) ){ if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
if ( typeof(winDesigner) == "undefined" || winDesigner.closed ){ winDesigner = window.open("../designer?prj_uid=" + resp.result.PRO_UID, 'winDesigner');
winDesigner = window.open( Ext.getCmp('newProjectWin').close();
"../designer?prj_uid="+resp.result.PRO_UID, processesGrid.store.reload();
'winDesigner' } else {
); location.href = '../designer?prj_uid=' + resp.result.PRO_UID;
Ext.getCmp('newProjectWin').close(); }
processesGrid.store.reload();
} else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
}
} else {
location.href = '../designer?prj_uid='+resp.result.PRO_UID;
}
} }
}, },
failure: function(obj, resp) { failure: function(obj, resp) {
@@ -653,14 +644,7 @@ editProcess = function(typeParam)
} }
if ( ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) && (type == "bpmn") ) { if ( ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) && (type == "bpmn") ) {
if (typeof(winDesigner) == "undefined" || winDesigner.closed){ winDesigner = window.open(url, 'winDesigner');
winDesigner = window.open(
url,
'winDesigner'
);
} else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
}
} else { } else {
location.href = url; location.href = url;
} }
@@ -968,19 +952,12 @@ importProcessExistGroup = function()
var sNewProUid = resp_.sNewProUid; var sNewProUid = resp_.sNewProUid;
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") { if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
if ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1) ) { if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
if (typeof(winDesigner) == "undefined" || winDesigner.closed){ winDesigner = window.open("../designer?prj_uid=" + sNewProUid, 'winDesigner');
winDesigner = window.open( w.close();
"../designer?prj_uid=" + sNewProUid, processesGrid.store.reload();
'winDesigner'
);
w.close();
processesGrid.store.reload();
} else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
}
} else { } else {
window.location.href = "../designer?prj_uid=" + sNewProUid; window.location.href = "../designer?prj_uid=" + sNewProUid;
} }
} else { } else {
window.location.href = "processes_Map?PRO_UID=" + sNewProUid; window.location.href = "processes_Map?PRO_UID=" + sNewProUid;
@@ -1116,21 +1093,14 @@ importProcessExistProcess = function()
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 ( (navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) { if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
if (typeof(winDesigner) == "undefined" || winDesigner.closed){ winDesigner = window.open("../designer?prj_uid=" + sNewProUid,'winDesigner');
winDesigner = window.open( Ext.getCmp('importProcessWindow').close();
"../designer?prj_uid=" + sNewProUid, w.close();
'winDesigner' processesGrid.store.reload();
); } else {
Ext.getCmp('importProcessWindow').close();
w.close();
processesGrid.store.reload();
} else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
}
} else {
window.location.href = "../designer?prj_uid=" + sNewProUid; window.location.href = "../designer?prj_uid=" + sNewProUid;
} }
} else { } else {
window.location.href = "processes_Map?PRO_UID=" + sNewProUid; window.location.href = "processes_Map?PRO_UID=" + sNewProUid;
} }
@@ -1176,11 +1146,6 @@ importProcessExistProcess = function()
importProcess = function() importProcess = function()
{ {
if (winDesigner) {
winDesigner.close();
if (!winDesigner.closed)
return;
}
var processFileType = importProcessGlobal.processFileType; var processFileType = importProcessGlobal.processFileType;
var processFileTypeTitle = (processFileType == "pm") ? "" : " " + processFileType; var processFileTypeTitle = (processFileType == "pm") ? "" : " " + processFileType;
@@ -1276,21 +1241,13 @@ importProcess = function()
var sNewProUid = resp_.sNewProUid; var sNewProUid = resp_.sNewProUid;
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") { if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) { if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
if (typeof(winDesigner) == "undefined" || winDesigner.closed){ winDesigner = window.open("../designer?prj_uid=" + sNewProUid,"winDesigner");
winDesigner = window.open( w.close();
"../designer?prj_uid=" + sNewProUid, processesGrid.store.reload();
"winDesigner" } else {
); window.location.href = "../designer?prj_uid=" + sNewProUid;
}
w.close();
processesGrid.store.reload();
} else {
PMExt.error( _("ID_FAILED"), _("PROCESS_ALREADY_OPENED"));
}
} else {
window.location.href = "../designer?prj_uid=" + sNewProUid;
}
} else { } else {
window.location.href = "processes_Map?PRO_UID=" + sNewProUid; window.location.href = "processes_Map?PRO_UID=" + sNewProUid;
} }