From 5d7e082060fce3ce0086cd9f6a97333c98aed7e1 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Fri, 3 Jul 2015 12:18:26 -0400 Subject: [PATCH 1/3] =?UTF-8?q?PM-2913=20"(Code=20Scanner)=20Designer>Impo?= =?UTF-8?q?rt:=20La=20alerta..."=20SOLVED=20>=20Code=20Isuue:=20=20=20(Cod?= =?UTF-8?q?e=20Scanner)=20Designer=20>=20Import:=20La=20alerta=20de=20vali?= =?UTF-8?q?daci=C3=B3o=20se=20muestra=20completa=20en=20los=20navegadores?= =?UTF-8?q?=20Chrome=20>=20Solution:=20=20=20El=20texto=20que=20se=20muest?= =?UTF-8?q?ra=20en=20la=20ventana=20en=20el=20browser=20chrome=20se=20mues?= =?UTF-8?q?tra=20correctamente.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/templates/processes/main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 73e2b0f37..e74df4a45 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -1251,6 +1251,8 @@ importProcess = function() Ext.MessageBox.show({ title: _("ID_ERROR"), msg: "
" + stringReplace("\\x0A", "
", resp_.message) + "
", //\n 10 + width: 570, + height: 250, icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK }); From a6da27260c93bb838e1794e28b916e666164b329 Mon Sep 17 00:00:00 2001 From: ricardo Date: Mon, 13 Jul 2015 12:11:57 -0400 Subject: [PATCH 2/3] 0017583: Clicking on the folder icon with a plus sign for Enterprise Features causes an error SOLVED al darle click a la imagen con el simbolo + daba un mensaje de error se soluciono quitandole la funcion de click en celda en la parte de features --- .../templates/enterprise/addonsStore.js | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/workflow/engine/templates/enterprise/addonsStore.js b/workflow/engine/templates/enterprise/addonsStore.js index 15b0bedef..1a417566d 100644 --- a/workflow/engine/templates/enterprise/addonsStore.js +++ b/workflow/engine/templates/enterprise/addonsStore.js @@ -1492,38 +1492,6 @@ Ext.onReady(function() { listeners: { render: function(){ this.loadMask = new Ext.LoadMask(this.body, {msg:_('ID_LOADING_GRID')}); - }, - "cellclick": function (grid, rowIndex, columnIndex, e) { - var record = grid.getStore().getAt(rowIndex); - var fieldName = grid.getColumnModel().getDataIndex(columnIndex); - - if (fieldName != "status") { - return; - } - - switch (record.get("status")) { - case "upgrade": - case "ready": - if (INTERNET_CONNECTION == 1) { - installAddon(record.get("id"), record.get("store")); - } else { - Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_NO_INTERNET_CONECTION')); - } - break; - case "download": - Ext.Ajax.request({ - url: "addonsStoreAction", - params: { - "action": "cancel", - "addon": record.get("id"), - "store": record.get("store") - } - }); - break; - case "available": - addonAvailable(record.get("id")); - break; - } } } }); From 9cdee7bb50e3ea3daec49bfa1bfa4e2fee2c02ad Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 13 Jul 2015 18:39:59 -0400 Subject: [PATCH 3/3] PM-2576 "Support for Timer-Event (End-points and Backend)" SOLVED Issue: Los procesos inactivos siguen ejecutandose con el timereventcron Cause: Falta validacion para procesos inactivos Solution: Se agrego validacion, solo se consideran a procesos activos para iniciar/continuar el caso --- .../src/ProcessMaker/BusinessModel/TimerEvent.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php index 4d4423fdc..de2c8f6ce 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php @@ -1190,6 +1190,12 @@ class TimerEvent $criteria->addSelectColumn(\BpmnEventPeer::EVN_NAME); $criteria->addSelectColumn(\ElementTaskRelationPeer::TAS_UID); + $arrayCondition = array(); + $arrayCondition[] = array(\TimerEventPeer::PRJ_UID, \ProcessPeer::PRO_UID, \Criteria::EQUAL); + $criteria->addJoinMC($arrayCondition, \Criteria::INNER_JOIN); + + $criteria->add(\ProcessPeer::PRO_STATUS, "ACTIVE", \Criteria::EQUAL); + $arrayCondition = array(); $arrayCondition[] = array(\TimerEventPeer::PRJ_UID, \ElementTaskRelationPeer::PRJ_UID, \Criteria::EQUAL); $arrayCondition[] = array(\TimerEventPeer::EVN_UID, \ElementTaskRelationPeer::ELEMENT_UID, \Criteria::EQUAL); @@ -1257,6 +1263,8 @@ class TimerEvent if ((int)($hour . $minute) <= (int)($hourCase . $minuteCase)) { $flagCase = $hourCase == $hour && $minuteCase == $minute; } else { + $timerEventNextRunDateNew = $this->getNextRunDateByDataAndDatetime($arrayTimerEventData, $datetime); //Generate new date for old TMREVN_NEXT_RUN_DATE + $flagCase = true; //Create the old case } } @@ -1361,6 +1369,12 @@ class TimerEvent $criteriaMain->addSelectColumn(\AppDelegationPeer::DEL_DELEGATE_DATE); $criteriaMain->addSelectColumn(\BpmnEventPeer::EVN_NAME); + $arrayCondition = array(); + $arrayCondition[] = array(\AppDelegationPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::EQUAL); + $criteriaMain->addJoinMC($arrayCondition, \Criteria::INNER_JOIN); + + $criteriaMain->add(\ProcessPeer::PRO_STATUS, "ACTIVE", \Criteria::EQUAL); + $arrayCondition = array(); $arrayCondition[] = array(\AppDelegationPeer::APP_UID, \ApplicationPeer::APP_UID, \Criteria::EQUAL); $criteriaMain->addJoinMC($arrayCondition, \Criteria::INNER_JOIN);