From 9f39979ce15fd74cc73f4d787d7795dc16fb3064 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Sat, 24 Jan 2015 14:15:20 -0400 Subject: [PATCH 1/5] PM-1411 "Despues de crear un trigger con upper case con..." SOLVED Issue: Despues de crear un trigger con upper case con caracteres extranios se bloquea el listado de triggers y deja de responder permanentemente Cause: El problema se debe a que la respuesta del endpoint contiene el atributo "tri_param", para triggers creados con el wizard contiene una cadena serializada que ha sido formateada con "G::json_encode", esto ocasiona que el JSON de respuesta este mal definido, esto cuando tiene caracteres raros como por ejemplo "enie" Solution: - Back-end, se ha eliminado el uso del "G::json_encode" - Front-end, el atributo "tri_param" ahora es un objeto (ya no es cadena) --- workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php b/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php index f4ae6ea70..1ee096271 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php @@ -74,7 +74,9 @@ class Trigger } else { if ($aRow['TRI_PARAM'] != '' && $aRow['TRI_PARAM'] != 'PRIVATE') { $aRow['TRI_PARAM'] = unserialize($aRow['TRI_PARAM']); - $aRow['TRI_PARAM'] = \G::json_encode($aRow['TRI_PARAM']); + + unset($aRow["TRI_PARAM"]["hash"]); + unset($aRow["TRI_PARAM"]["params"]["TRI_WEBBOT"]); } } $triggersArray[] = array_change_key_case($aRow, CASE_LOWER); From 0ac577a96c46843bfabfe8e41a8276ecbba9de12 Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Sat, 24 Jan 2015 13:49:35 -0400 Subject: [PATCH 2/5] PM-1393 "Subprocesos muestran un error al momento de hacer correr el caso" SOLVED --- workflow/engine/classes/class.case.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index b79ea1a1c..c73feeb49 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -988,10 +988,11 @@ class Cases if (isset($Fields["APP_STATUS"]) && $Fields["APP_STATUS"] == "COMPLETED") { if (isset($Fields['CURRENT_USER_UID'])) { $Fields['USR_UID'] = $Fields['CURRENT_USER_UID']; + /*This "list" code is discussed to operate with sub-processes. It should adjust the code for operation with sub-processes. $listCompleted = new ListCompleted(); $listCompleted->create($Fields); $listMyInbox = new ListMyInbox(); - $listMyInbox->refresh($Fields); + $listMyInbox->refresh($Fields);*/ } } $oApp->update($Fields); From a34223c248ce09fe76de5bad5adca7b2110c976b Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 23 Jan 2015 17:08:20 -0400 Subject: [PATCH 3/5] IMPROVEMENT PM-1323 --- workflow/engine/templates/processes/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index e835e14a3..62b70dd36 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -447,6 +447,7 @@ Ext.onReady(function(){ id: "mnuGenerateBpmn", text: _("ID_GENERATE_BPMN_PROJECT"), iconCls: "button_menu_ext ss_sprite ss_page_white_go", + hidden: true, handler: function () { generateBpmn(); From ff2515442187171414474d35c403d7270c9deb3d Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 23 Jan 2015 17:25:13 -0400 Subject: [PATCH 4/5] IMPROVEMENT PM-1355 --- workflow/engine/methods/cases/ajaxListener.php | 8 ++++++++ .../templates/cases/cases_Step_Pmdynaform_View.html | 1 + 2 files changed, 9 insertions(+) diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index 3506c629e..08108a955 100755 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -851,7 +851,15 @@ class Ajax $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = ""; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP"] = "#"; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_ACTION"] = "return false;"; + G::LoadClass('pmDynaform'); + $a = new pmDynaform($_REQUEST['DYN_UID'], $Fields['APP_DATA']); + if ($a->isResponsive()) { + $a->app_data["PROCESS"] = $_SESSION['PROCESS']; + $a->app_data["SYS_SYS"] = SYS_SYS; + $a->printView((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION']); + } else { $G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_POST["DYN_UID"], "", $Fields["APP_DATA"], "", "", "view"); + } ?>