From 4ecc8e26f00cd35122e1df452179108fd752222d Mon Sep 17 00:00:00 2001 From: Carlos Pacha Date: Thu, 21 Apr 2011 09:53:44 -0400 Subject: [PATCH] =?UTF-8?q?BUG=206650=20Debugger=20doesn=C2=B4t=20show=20t?= =?UTF-8?q?riggers=20when=20using=20a=20web=20entry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Improving code --- workflow/engine/classes/class.wsBase.php | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 61e982db7..f00ca016e 100644 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -1480,7 +1480,8 @@ class wsBase if ($bExecute) { $oPMScript->setScript($aTrigger['TRI_WEBBOT']); $oPMScript->execute(); - $varTriggers .= " - ".nl2br(htmlentities($this->getNameTrigger($aTrigger['TRI_UID']), ENT_QUOTES)) . "
"; + $oTrigger = TriggersPeer::retrieveByPk($aTrigger['TRI_UID']); + $varTriggers .= " - ".nl2br(htmlentities($oTrigger->getTriTitle(), ENT_QUOTES)) . "
"; //$appFields = $oCase->loadCase( $caseId ); $appFields['APP_DATA'] = $oPMScript->aFields; //$appFields['APP_DATA']['APPLICATION'] = $caseId; @@ -1581,7 +1582,8 @@ class wsBase if ($bExecute) { $oPMScript->setScript($aTrigger['TRI_WEBBOT']); $oPMScript->execute(); - $varTriggers .= " - ".nl2br(htmlentities($this->getNameTrigger($aTrigger['TRI_UID']), ENT_QUOTES)) . "
"; + $oTrigger = TriggersPeer::retrieveByPk($aTrigger['TRI_UID']); + $varTriggers .= " - ".nl2br(htmlentities($oTrigger->getTriTitle(), ENT_QUOTES)) . "
"; //$appFields = $oCase->loadCase( $caseId ); $appFields['APP_DATA'] = $oPMScript->aFields; //$appFields['APP_DATA']['APPLICATION'] = $caseId; @@ -2081,23 +2083,5 @@ class wsBase return $result; } } - /* - * this function gets the name of a trigger - * @param string uidTri : it is the uid of trigger - * @return: it returns a string - */ - public function getNameTrigger($uidTri){ - - $c = new Criteria('workflow'); - $c->addSelectColumn(ContentPeer::CON_VALUE); - $c->add(ContentPeer::CON_ID, $uidTri); - $c->add(ContentPeer::CON_CATEGORY, 'TRI_TITLE'); - $oDataset = ContentPeer::doSelectRS($c); - $oDataset->next(); - $aRow = $oDataset->getRow(); - return $aRow[0]; - } - - }