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

PM-1447

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-04-04 18:43:24 -04:00
parent 87c22be11b
commit 6fa60dc0c1
2 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmDynaform.php
View File

@@ -184,7 +184,7 @@ class pmDynaform
$cells = array(); $cells = array();
foreach ($json->columns as $column) { foreach ($json->columns as $column) {
//data //data
if ($column->type === "checkbox" || $column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "datetime") { if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link") {
array_push($cells, array( array_push($cells, array(
"value" => isset($row[$column->name]) ? $row[$column->name] : "", "value" => isset($row[$column->name]) ? $row[$column->name] : "",
"label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : "" "label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : ""

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

@@ -601,13 +601,7 @@ 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)) { openWindowIfIE('../designer?prj_uid=' + resp.result.PRO_UID);
winDesigner = window.open("../designer?prj_uid=" + resp.result.PRO_UID, 'winDesigner');
Ext.getCmp('newProjectWin').close();
processesGrid.store.reload();
} else {
location.href = '../designer?prj_uid=' + resp.result.PRO_UID;
}
} }
}, },
failure: function(obj, resp) { failure: function(obj, resp) {
@@ -656,12 +650,7 @@ editProcess = function(typeParam)
} else { } else {
url = 'processes_Map?PRO_UID=' + pro_uid; url = 'processes_Map?PRO_UID=' + pro_uid;
} }
openWindowIfIE(url);
if ( ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) && (type == "bpmn") ) {
winDesigner = window.open(url, 'winDesigner');
} else {
location.href = url;
}
} }
editNewProcess = function(){ editNewProcess = function(){
@@ -870,6 +859,7 @@ importProcessExistGroup = function()
var processFileType = importProcessGlobal.processFileType; var processFileType = importProcessGlobal.processFileType;
var w = new Ext.Window({ var w = new Ext.Window({
id : 'importProcessExistGroupWindow',
title : _('ID_IMPORT_PROCESS') + processFileTypeTitle, title : _('ID_IMPORT_PROCESS') + processFileTypeTitle,
header : false, header : false,
width : 460, width : 460,
@@ -966,13 +956,7 @@ 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)) { openWindowIfIE("../designer?prj_uid=" + sNewProUid);
winDesigner = window.open("../designer?prj_uid=" + sNewProUid, 'winDesigner');
w.close();
processesGrid.store.reload();
} 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;
} }
@@ -1012,6 +996,7 @@ importProcessExistProcess = function()
var proFileName = importProcessGlobal.proFileName; var proFileName = importProcessGlobal.proFileName;
var w = new Ext.Window({ var w = new Ext.Window({
id : 'importProcessExistProcessWindow',
title : _('ID_IMPORT_PROCESS') + processFileTypeTitle, title : _('ID_IMPORT_PROCESS') + processFileTypeTitle,
header : false, header : false,
width : 460, width : 460,
@@ -1115,14 +1100,7 @@ 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)) { openWindowIfIE("../designer?prj_uid=" + sNewProUid);
winDesigner = window.open("../designer?prj_uid=" + sNewProUid,'winDesigner');
Ext.getCmp('importProcessWindow').close();
w.close();
processesGrid.store.reload();
} 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;
} }
@@ -1263,13 +1241,7 @@ 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)) { openWindowIfIE("../designer?prj_uid=" + sNewProUid);
winDesigner = window.open("../designer?prj_uid=" + sNewProUid,"winDesigner");
w.close();
processesGrid.store.reload();
} 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;
} }
@@ -1334,6 +1306,7 @@ importProcess = function()
} }
var windowbpmnoption = new Ext.Window({ var windowbpmnoption = new Ext.Window({
id: 'windowBpmnOptionWindow',
title: _('ID_IMPORT_PROCESS'), title: _('ID_IMPORT_PROCESS'),
header: false, header: false,
width: 420, width: 420,
@@ -1507,3 +1480,31 @@ Ext.EventManager.on(window, 'beforeunload', function () {
if (winDesigner) if (winDesigner)
winDesigner.close(); winDesigner.close();
}); });
function openWindowIfIE(pathDesigner) {
if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
if (Ext.getCmp('newProjectWin'))
Ext.getCmp('newProjectWin').close();
if (Ext.getCmp('importProcessWindow'))
Ext.getCmp('importProcessWindow').close();
if (Ext.getCmp('importProcessExistGroupWindow'))
Ext.getCmp('importProcessExistGroupWindow').close();
if (Ext.getCmp('importProcessExistProcessWindow'))
Ext.getCmp('importProcessExistProcessWindow').close();
if (Ext.getCmp('windowBpmnOptionWindow'))
Ext.getCmp('windowBpmnOptionWindow').close();
processesGrid.store.reload();
if (winDesigner && winDesigner.closed === false) {
if (winDesigner.window.PMDesigner.project.isDirty()) {
Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_UNSAVED_TRIGGERS_WINDOW'));
} else {
winDesigner = window.open(pathDesigner, 'winDesigner');
}
} else {
winDesigner = window.open(pathDesigner, 'winDesigner');
}
return;
}
location.href = pathDesigner;
}