From 67775896be88031279ca00c1f29485216fc219e2 Mon Sep 17 00:00:00 2001 From: Carlos Pacha Date: Thu, 12 May 2011 11:22:45 -0400 Subject: [PATCH] BUG 5011 Initial tasks in a process doen't appear in the dropdown box in Event This issue has been solved, the dropdown box has all the task now --- workflow/engine/methods/events/eventsEdit.php | 6 +++--- workflow/engine/methods/events/eventsNew.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/engine/methods/events/eventsEdit.php b/workflow/engine/methods/events/eventsEdit.php index 03fc70013..95fa7f4eb 100644 --- a/workflow/engine/methods/events/eventsEdit.php +++ b/workflow/engine/methods/events/eventsEdit.php @@ -50,12 +50,12 @@ if (!isset($_SESSION['PROCESS'])){ } $oTasks = new Tasks(); -$aAux1 = $oTasks->getAllTasks($aFields['PRO_UID']); +$aAux1 = $oTasks->getAllTaskstoEvents($aFields['PRO_UID']); $aTasks = array(); $aTasks[] = array('TAS_UID' => 'char', 'TAS_TITLE' => 'char'); foreach ($aAux1 as $aAux2) { - if ($aAux2['TAS_TYPE'] != 'SUBPROCESS' && $aAux2['TAS_START'] != 'TRUE') { + if ($aAux2['TAS_TYPE'] != 'SUBPROCESS') { $aTasks[] = array('TAS_UID' => $aAux2['TAS_UID'], 'TAS_TITLE' => $aAux2['TAS_TITLE']); } } @@ -82,4 +82,4 @@ $_SESSION['_DBArray'] = $_DBArray; $G_PUBLISH = new Publisher(); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'events/eventsEdit', '', $aFields, '../events/eventsSave'); G::RenderPage('publish', 'raw'); -?> \ No newline at end of file +?> diff --git a/workflow/engine/methods/events/eventsNew.php b/workflow/engine/methods/events/eventsNew.php index f7a8cd6fb..0f49f3e9a 100644 --- a/workflow/engine/methods/events/eventsNew.php +++ b/workflow/engine/methods/events/eventsNew.php @@ -40,7 +40,7 @@ $aTasks[] = array('TAS_UID' => 'char', 'TAS_TITLE' => 'char'); //g::pr($aAux1);die; foreach ($aAux1 as $aAux2) { - if ($aAux2['TAS_TYPE'] != 'SUBPROCESS' && $aAux2['TAS_START'] != 'TRUE') { + if ($aAux2['TAS_TYPE'] != 'SUBPROCESS') { $aTasks[] = array('TAS_UID' => $aAux2['TAS_UID'], 'TAS_TITLE' => $aAux2['TAS_TITLE']); } }