From 4ed0494c7c52ce6774f60b7fc80e4226ddd7d273 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Wed, 27 May 2015 12:49:47 -0400 Subject: [PATCH 1/5] PM-2821 Design>NewBPMN>Output o Template Editor: la ventana emergente para agregar grillas permanece hasta despues de la segunda grilla agregada. Este comportamiento se los replicaba "aveces", una vez introducida la grilla, se fuerza a que se cierre la venta. --- workflow/engine/js/controls/variablePicker.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/engine/js/controls/variablePicker.js b/workflow/engine/js/controls/variablePicker.js index c3b39db45..8dac84bd3 100755 --- a/workflow/engine/js/controls/variablePicker.js +++ b/workflow/engine/js/controls/variablePicker.js @@ -4,6 +4,7 @@ var setVariablePickerJS = function(){ if(this.value.substring(0,5) == 'gridt') { try { updateEditorContent(this.value.substring(5)); + closePluginPopup(); } catch(err) { closePluginPopup(); } @@ -21,6 +22,7 @@ var setVariablePickerJS = function(){ if(element.value.substring(0,5) == 'gridt') { try { updateEditorContent(element.value.substring(5)); + closePluginPopup(); } catch(err) { closePluginPopup(); } From 4a22623bb3e6d5e9a68a56f470457fd544797ec7 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Thu, 28 May 2015 10:36:31 -0400 Subject: [PATCH 2/5] PM-2827: I added a messaje when the supervisor does not have permission for dynaform(s) --- .../engine/methods/cases/cases_OpenToRevise.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/workflow/engine/methods/cases/cases_OpenToRevise.php b/workflow/engine/methods/cases/cases_OpenToRevise.php index cefc8461d..ac920d716 100755 --- a/workflow/engine/methods/cases/cases_OpenToRevise.php +++ b/workflow/engine/methods/cases/cases_OpenToRevise.php @@ -71,6 +71,13 @@ $_SESSION['STEP_POSITION'] = 0; /* Redirect to next step */ $aNextStep = $oCase->getNextSupervisorStep( $_SESSION['PROCESS'], 0 ); -$sPage = "cases_StepToRevise?type=DYNAFORM&PRO_UID=" . $aFields['PRO_UID'] . "&DYN_UID=" . $aNextStep['UID'] . "&APP_UID=$sAppUid&DEL_INDEX=$iDelIndex&position=1"; //$aNextStep['PAGE']; -G::header( 'location: ' . $sPage ); - +if($aNextStep['UID'] != ''){ + $sPage = "cases_StepToRevise?type=DYNAFORM&PRO_UID=" . $aFields['PRO_UID'] . "&DYN_UID=" . $aNextStep['UID'] . "&APP_UID=$sAppUid&DEL_INDEX=$iDelIndex&position=1"; //$aNextStep['PAGE']; + G::header( 'location: ' . $sPage ); +}else{ + $aMessage = array (); + $aMessage['MESSAGE'] = G::LoadTranslation( 'ID_SUPERVISOR_DOES_NOT_HAVE_DYNAFORMS' ); + $G_PUBLISH = new Publisher(); + $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage ); + G::RenderPage( 'publishBlank', 'blank' ); +} \ No newline at end of file From a136e1adebc485e1b4a17047301522e067e43422 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 28 May 2015 17:44:37 -0400 Subject: [PATCH 3/5] =?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 69ede48baf366e263f0a5d3f973d10418b4c5c61 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 29 May 2015 12:03:35 -0400 Subject: [PATCH 4/5] PM-2672 La cuadro "Get Started" es modal, pero en Chrome esta propiedad no ocupa toda la ventana del Navegador --- workflow/engine/skinEngine/neoclassic/css/form.css | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/skinEngine/neoclassic/css/form.css b/workflow/engine/skinEngine/neoclassic/css/form.css index 58a553086..5fc8dbfb6 100644 --- a/workflow/engine/skinEngine/neoclassic/css/form.css +++ b/workflow/engine/skinEngine/neoclassic/css/form.css @@ -293,6 +293,7 @@ INPUT { background-color: black; left: 0px; top: 0px; + height:100% !important; } .panel_iframe___processmaker { width: 100%; From 1aee191a1bee412bb70ea1a6b55cc7ba145b15b7 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 29 May 2015 14:42:29 -0400 Subject: [PATCH 5/5] 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])){