From a136e1adebc485e1b4a17047301522e067e43422 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 28 May 2015 17:44:37 -0400 Subject: [PATCH 1/2] =?UTF-8?q?PM-2713=20Outlook=20Connector:=20No=20muest?= =?UTF-8?q?ra=20la=20informaci=C3=B3e=20Process=20Map=20en=20el=20cliente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/templates/cases/open.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index a9ff7a662..6292f2ee1 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -1539,7 +1539,7 @@ Ext.onReady(function(){ TabPanel.setActiveTab(tabId); } else { - if(name == "processMap" && isBrowserIE()){ + if(name == "processMap" && isBrowserIE() && _PROJECT_TYPE === 'bpmn'){ var windContainer = window.open(uri,"winContainer"); } else { TabPanel.add({ From 1aee191a1bee412bb70ea1a6b55cc7ba145b15b7 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 29 May 2015 14:42:29 -0400 Subject: [PATCH 2/2] PM-2791: I added the regular expresion in other place --- workflow/engine/classes/class.wsTools.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 098598a99..944ab1734 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1357,6 +1357,10 @@ class workspaceTools } if ( !$flag && !is_null($flagFunction) ) { + //Replace TYPE by ENGINE + $script = file_get_contents($filename); + $script = preg_replace('/\)TYPE\=|\)\sTYPE\=/', ')ENGINE=', $script); + file_put_contents($filename,$script); $aHost = explode(':',$parameters['dbHost']); $dbHost = $aHost[0]; if(isset($aHost[1])){