From 36c361c5570968111991817b5dc2c5887ca409dd Mon Sep 17 00:00:00 2001 From: Brayan Pereyra Date: Thu, 16 Apr 2015 12:25:15 -0400 Subject: [PATCH 1/6] PM-2333 Al adicionar una activity ya creado a un lane duplica el mismo --- .../engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index 902e075e8..0235e922c 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -1384,10 +1384,6 @@ class BpmnWorkflow extends Project\Bpmn $activity = $bwp->getActivity($activityData["ACT_UID"]); - if ($activity["BOU_CONTAINER"] != $activityData["BOU_CONTAINER"]) { - $activity = null; - } - if ($forceInsert || is_null($activity)) { if ($generateUid) { //Generate and update UID From 4af53d2768d91ad989dc588cdb7e24a0f0f30c33 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Fri, 17 Apr 2015 10:04:59 -0400 Subject: [PATCH 2/6] PM-2112 "Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets.." SOLVED Issue: Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets the HTTP status to 200 (OK) when error Cause: Al obtener un "access token" con informacion erronea, no se define correctamente el response de error Solution: Se revierte el 1er cambio y se aplica un "exit(0);", ya que el status code se sobre escribia --- .../src/ProcessMaker/Services/OAuth2/Server.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php index 9c74bd208..72f288b38 100644 --- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php +++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php @@ -309,17 +309,9 @@ class Server implements iAuthenticate if ($returnResponse) { return $response; } else { - if ($response->getStatusCode() == 400) { - $msg = $response->getParameter("error_description", ""); - $msg = ($msg != "")? $msg : $response->getParameter("error", ""); + $response->send(); - $rest = new \Maveriks\Extension\Restler(); - $rest->setMessage(new \Luracast\Restler\RestException(\ProcessMaker\Services\Api::STAT_APP_EXCEPTION, $msg)); - - exit(0); - } else { - $response->send(); - } + exit(0); } } From 4629ff8add1fa7ce38d8726f6a923948ba2ecd89 Mon Sep 17 00:00:00 2001 From: jennylee Date: Fri, 17 Apr 2015 10:48:39 -0400 Subject: [PATCH 3/6] Fixing a merge error --- workflow/engine/classes/class.calendar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.calendar.php b/workflow/engine/classes/class.calendar.php index 7ec30c177..48f50b77f 100755 --- a/workflow/engine/classes/class.calendar.php +++ b/workflow/engine/classes/class.calendar.php @@ -414,7 +414,7 @@ class calendar extends CalendarDefinition $hoursDuration -= (float)($secondRes/3600); //$dataLog[] = (float)($secondRes/3600); } else { - $newDate = date('Y-m-d H:i:s', strtotime('+' . (((float)$hoursDuration)*3600) . ' seconds', strtotime($newDate))); + $newDate = date("Y-m-d H:i:s", strtotime("+" . round(((float)($hoursDuration)) * 3600) . " seconds", strtotime($newDate))); //$dataLog[] = (float)($hoursDuration); $hoursDuration = 0; } From fd0905a2cb6dd676b7c6dff337db49f3260d1422 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 17 Apr 2015 12:17:20 -0400 Subject: [PATCH 4/6] =?UTF-8?q?PM-2313=200017153:=20Always=20dropping=20da?= =?UTF-8?q?tabase=20when=20creating=20a=20new=20site=20from=20install/newS?= =?UTF-8?q?ite.=20Causa=20:=20Fue=20definida=20asi,=20y=20siempre=20hacia?= =?UTF-8?q?=20drop=20de=20bases=20de=20datos.=20Soluci=C3=B3=20Aunque=20de?= =?UTF-8?q?sde=20la=20interfaz=20siempre=20se=20verificaba=20la=20base=20d?= =?UTF-8?q?e=20datos=20si=20existia=20sin=20embargo=20onternamente=20se=20?= =?UTF-8?q?hacia=20un=20drop=20de=20esa=20base=20de=20datos.=20Se=20valido?= =?UTF-8?q?=20esto=20con=20el=20cual=20se=20controla=20ese=20comportamient?= =?UTF-8?q?o.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/templates/setup/newSite.js | 25 +++++++++++-------- .../xmlform/login/forgotPasswordpm3.xml | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/workflow/engine/templates/setup/newSite.js b/workflow/engine/templates/setup/newSite.js index 17682f224..badfc12e5 100755 --- a/workflow/engine/templates/setup/newSite.js +++ b/workflow/engine/templates/setup/newSite.js @@ -198,20 +198,23 @@ Ext.onReady(function(){ function createNW(nwTitle, aoDbWf, aoDbRb, aoDbRp, nwUsername, nwPassword, nwPassword2){ PMExt.confirm(_('ID_CONFIRM'), _('NEW_SITE_CONFIRM_TO_CREATE'), function(){ var loadMask = new Ext.LoadMask(document.body, {msg : _('ID_SITE_CREATING')}); + var oParams = { + action : 'create', + NW_TITLE : nwTitle, + AO_DB_WF : aoDbWf, + AO_DB_RB : aoDbRb, + AO_DB_RP : aoDbRp, + NW_USERNAME : nwUsername, + NW_PASSWORD : nwPassword, + NW_PASSWORD2 : nwPassword2 + }; + if(aoDbDrop){ + oParams.AO_DB_DROP = 'On'; + } loadMask.show(); Ext.Ajax.request({ url: '../newSiteProxy/testingNW', - params: { - action : 'create', - NW_TITLE : nwTitle, - AO_DB_WF : aoDbWf, - AO_DB_RB : aoDbRb, - AO_DB_RP : aoDbRp, - NW_USERNAME : nwUsername, - NW_PASSWORD : nwPassword, - NW_PASSWORD2 : nwPassword2, - AO_DB_DROP : aoDbDrop - }, + params: oParams, method: 'POST', success: function ( result, request ) { loadMask.hide(); diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 1c148713a..87021af92 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -6,7 +6,7 @@ - + From ffd93998d266ab4f432627f256cb9c5827b21b18 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 17 Apr 2015 12:59:00 -0400 Subject: [PATCH 5/6] =?UTF-8?q?PM-2313=200017153:=20Always=20dropping=20da?= =?UTF-8?q?tabase=20when=20creating=20a=20new=20site=20from=20install/newS?= =?UTF-8?q?ite.=20Causa=20:=20Fue=20definida=20asi,=20y=20siempre=20hacia?= =?UTF-8?q?=20drop=20de=20bases=20de=20datos.=20Soluci=C3=B3=20Aunque=20de?= =?UTF-8?q?sde=20la=20interfaz=20siempre=20se=20verificaba=20la=20base=20d?= =?UTF-8?q?e=20datos=20si=20existia=20sin=20embargo=20onternamente=20se=20?= =?UTF-8?q?hacia=20un=20drop=20de=20esa=20base=20de=20datos.=20Se=20valido?= =?UTF-8?q?=20esto=20con=20el=20cual=20se=20controla=20ese=20comportamient?= =?UTF-8?q?o.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/xmlform/login/forgotPasswordpm3.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 87021af92..d73523a91 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -6,7 +6,7 @@ - + From 7cae1c26ff5e90951e1c9306182f128169d5c7e0 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 17 Apr 2015 14:34:29 -0400 Subject: [PATCH 6/6] =?UTF-8?q?PM-2313=200017153:=20Always=20dropping=20da?= =?UTF-8?q?tabase=20when=20creating=20a=20new=20site=20from=20install/newS?= =?UTF-8?q?ite.=20Causa=20:=20Fue=20definida=20asi,=20y=20siempre=20hacia?= =?UTF-8?q?=20drop=20de=20bases=20de=20datos.=20Soluci=C3=B3=20Aunque=20de?= =?UTF-8?q?sde=20la=20interfaz=20siempre=20se=20verificaba=20la=20base=20d?= =?UTF-8?q?e=20datos=20si=20existia=20sin=20embargo=20onternamente=20se=20?= =?UTF-8?q?hacia=20un=20drop=20de=20esa=20base=20de=20datos.=20Se=20valido?= =?UTF-8?q?=20esto=20con=20el=20cual=20se=20controla=20ese=20comportamient?= =?UTF-8?q?o.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/xmlform/login/forgotPasswordpm3.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index d73523a91..204c4d134 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -6,7 +6,7 @@ - +