From ac4464e02915ccb09d80005cd863b843367cac7c Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 20 Oct 2014 16:12:09 -0400 Subject: [PATCH 1/3] PM 554 "The description of process events..." SOLVED Code Issue: The description of "process events" does not support the character "&" Cause: Cuando se creaba un nuevo Events de tipo "Intermediate message" al llenar el label "Description" por ejemplo "hola&&mundo", el carcater "&&" no se visualizaba en el listado tal como se registro. Solution: Se valida la creacion de un nuevo "Events", con el caracter "&". --- workflow/engine/classes/model/Event.php | 8 +++++--- workflow/engine/js/events/events.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/model/Event.php b/workflow/engine/classes/model/Event.php index e06b8febb..fa469059e 100755 --- a/workflow/engine/classes/model/Event.php +++ b/workflow/engine/classes/model/Event.php @@ -104,6 +104,8 @@ class Event extends BaseEvent $aData['EVN_UID'] = G::generateUniqueID(); } + $aData["EVN_DESCRIPTION"] = str_replace("__AMP__", "&", $aData["EVN_DESCRIPTION"]); + $oConnection = Propel::getConnection( EventPeer::DATABASE_NAME ); try { $oEvent = new Event(); @@ -503,12 +505,12 @@ class Event extends BaseEvent $estimatedDuration = (float) $aData['EVN_TAS_ESTIMATED_DURATION']; $when = (float) $aData['EVN_WHEN']; $whenOccurs = $aData['EVN_WHEN_OCCURS']; - + if ($oCalendar->pmCalendarUid == '') { $oCalendar->getCalendar(null, $aData['PRO_UID'], $aData['TAS_UID']); $oCalendar->getCalendarData(); } - + if ($whenOccurs == 'AFTER_TIME') { //for multiple $sDueDate = date('Y-m-d H:i:s', $oDates->calculateDate($aData['DEL_DELEGATE_DATE'], $estimatedDuration, 'days', 1)); $sDueDate = $aData['DEL_TASK_DUE_DATE']; @@ -619,7 +621,7 @@ class Event extends BaseEvent $estimatedDuration = (float) $aData['EVN_TAS_ESTIMATED_DURATION']; $when = (float) $aData['EVN_WHEN']; $whenOccurs = $aData['EVN_WHEN_OCCURS']; - + if ($oCalendar->pmCalendarUid == '') { $oCalendar->getCalendar(null, $aData['PRO_UID'], $aData['TAS_UID']); $oCalendar->getCalendarData(); diff --git a/workflow/engine/js/events/events.js b/workflow/engine/js/events/events.js index 1265576d1..99a68e84d 100755 --- a/workflow/engine/js/events/events.js +++ b/workflow/engine/js/events/events.js @@ -14,7 +14,7 @@ var eventsNewAction = function(oForm) { url : '../events/eventsNewAction', method: 'POST', args : 'PRO_UID=' + getField('PRO_UID').value - + '&EVN_DESCRIPTION=' + getField('EVN_DESCRIPTION').value + + "&EVN_DESCRIPTION=" + stringReplace("\\&", "__AMP__", getField("EVN_DESCRIPTION").value) + '&EVN_STATUS=' + getField('EVN_STATUS').value + '&EVN_WHEN=' + getField('EVN_WHEN').value + '&EVN_WHEN_OCCURS=' + getField('EVN_WHEN_OCCURS').value From e89f7afa07628440e3a9c48f49aebc256280ae85 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 20 Oct 2014 17:11:52 -0400 Subject: [PATCH 2/3] PM 356 "The description of process events..." SOLVED --- workflow/engine/classes/model/Event.php | 4 +++- workflow/engine/js/events/events.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/model/Event.php b/workflow/engine/classes/model/Event.php index fa469059e..f3932d91a 100755 --- a/workflow/engine/classes/model/Event.php +++ b/workflow/engine/classes/model/Event.php @@ -104,7 +104,9 @@ class Event extends BaseEvent $aData['EVN_UID'] = G::generateUniqueID(); } - $aData["EVN_DESCRIPTION"] = str_replace("__AMP__", "&", $aData["EVN_DESCRIPTION"]); + if (isset($aData["EVN_DESCRIPTION"])) { + $aData["EVN_DESCRIPTION"] = str_replace("AMP", "&", $aData["EVN_DESCRIPTION"]); + } $oConnection = Propel::getConnection( EventPeer::DATABASE_NAME ); try { diff --git a/workflow/engine/js/events/events.js b/workflow/engine/js/events/events.js index 99a68e84d..492ade396 100755 --- a/workflow/engine/js/events/events.js +++ b/workflow/engine/js/events/events.js @@ -14,7 +14,7 @@ var eventsNewAction = function(oForm) { url : '../events/eventsNewAction', method: 'POST', args : 'PRO_UID=' + getField('PRO_UID').value - + "&EVN_DESCRIPTION=" + stringReplace("\\&", "__AMP__", getField("EVN_DESCRIPTION").value) + + "&EVN_DESCRIPTION=" + stringReplace("\\&", "AMP", getField("EVN_DESCRIPTION").value) + '&EVN_STATUS=' + getField('EVN_STATUS').value + '&EVN_WHEN=' + getField('EVN_WHEN').value + '&EVN_WHEN_OCCURS=' + getField('EVN_WHEN_OCCURS').value From 6c3a5e872f638b9235f82ae5ed32afa1dcb3a097 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 20 Oct 2014 17:19:09 -0400 Subject: [PATCH 3/3] PM 356 "The description of process events..." SOLVED --- workflow/engine/classes/model/Event.php | 2 +- workflow/engine/js/events/events.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/model/Event.php b/workflow/engine/classes/model/Event.php index f3932d91a..e1e25c03a 100755 --- a/workflow/engine/classes/model/Event.php +++ b/workflow/engine/classes/model/Event.php @@ -105,7 +105,7 @@ class Event extends BaseEvent } if (isset($aData["EVN_DESCRIPTION"])) { - $aData["EVN_DESCRIPTION"] = str_replace("AMP", "&", $aData["EVN_DESCRIPTION"]); + $aData["EVN_DESCRIPTION"] = str_replace("__AMP__", "&", $aData["EVN_DESCRIPTION"]); } $oConnection = Propel::getConnection( EventPeer::DATABASE_NAME ); diff --git a/workflow/engine/js/events/events.js b/workflow/engine/js/events/events.js index 492ade396..99a68e84d 100755 --- a/workflow/engine/js/events/events.js +++ b/workflow/engine/js/events/events.js @@ -14,7 +14,7 @@ var eventsNewAction = function(oForm) { url : '../events/eventsNewAction', method: 'POST', args : 'PRO_UID=' + getField('PRO_UID').value - + "&EVN_DESCRIPTION=" + stringReplace("\\&", "AMP", getField("EVN_DESCRIPTION").value) + + "&EVN_DESCRIPTION=" + stringReplace("\\&", "__AMP__", getField("EVN_DESCRIPTION").value) + '&EVN_STATUS=' + getField('EVN_STATUS').value + '&EVN_WHEN=' + getField('EVN_WHEN').value + '&EVN_WHEN_OCCURS=' + getField('EVN_WHEN_OCCURS').value