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

Merged in gproly/processmaker/PM-1417 (pull request #1511)

Browse Source 
PM-1417
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-20 17:02:43 -04:00
parent 7f14c81fa3 e05f2acf67
commit f3d90ae3db
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -972,6 +972,8 @@ importProcessExistGroup = function()
"../designer?prj_uid=" + sNewProUid, "../designer?prj_uid=" + sNewProUid,
'winDesigner' 'winDesigner'
); );
w.close();
processesGrid.store.reload();
} else { } else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED')); PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
} }
@@ -1118,6 +1120,9 @@ importProcessExistProcess = function()
"../designer?prj_uid=" + sNewProUid, "../designer?prj_uid=" + sNewProUid,
'winDesigner' 'winDesigner'
); );
Ext.getCmp('importProcessWindow').close();
w.close();
processesGrid.store.reload();
} else { } else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED')); PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
} }
@@ -1178,6 +1183,7 @@ importProcess = function()
var processFileTypeTitle = (processFileType == "pm") ? "" : " " + processFileType; var processFileTypeTitle = (processFileType == "pm") ? "" : " " + processFileType;
var w = new Ext.Window({ var w = new Ext.Window({
id : 'importProcessWindow',
title : _('ID_IMPORT_PROCESS')+processFileTypeTitle, title : _('ID_IMPORT_PROCESS')+processFileTypeTitle,
width : 420, width : 420,
height : 130, height : 130,
@@ -1261,6 +1267,8 @@ importProcess = function()
"../designer?prj_uid=" + sNewProUid, "../designer?prj_uid=" + sNewProUid,
'winDesigner' 'winDesigner'
); );
w.close();
processesGrid.store.reload();
} else { } else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED')); PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
} }