From c9c3e47a61c3391d2f4ab8ce3b65d638cb1eebda Mon Sep 17 00:00:00 2001 From: Carlos Pacha Date: Fri, 14 Oct 2011 09:46:01 -0400 Subject: [PATCH] BUG 5358 Trigger wizard encloses all function parameters in single quotes This issue was fixed, now it is setting the value with the correct format --- workflow/engine/methods/triggers/triggers_WizardSave.php | 7 ++++--- .../engine/methods/triggers/triggers_WizardUpdate.php | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/workflow/engine/methods/triggers/triggers_WizardSave.php b/workflow/engine/methods/triggers/triggers_WizardSave.php index 5018bc8eb..95b5078db 100755 --- a/workflow/engine/methods/triggers/triggers_WizardSave.php +++ b/workflow/engine/methods/triggers/triggers_WizardSave.php @@ -62,10 +62,11 @@ foreach ( $aInfoFunction as $k => $v ) { if ($aDataTriggers [$sOptionTrigger] != '') { if ((strstr ( $aDataTriggers [$sOptionTrigger], "@@" ))) { - $option = trim($aDataTriggers [$sOptionTrigger]); + $option = trim($aDataTriggers [$sOptionTrigger]); } else { - $aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]); - $option = "'" . trim($aDataTriggers [$sOptionTrigger]) . "'"; + $aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]); + $option = (is_numeric($aDataTriggers [$sOptionTrigger]))?trim($aDataTriggers [$sOptionTrigger]): + (strstr($aDataTriggers [$sOptionTrigger],"array") )?trim($aDataTriggers [$sOptionTrigger]):"'" . trim($aDataTriggers [$sOptionTrigger]) . "'"; } } else { $option = "''"; diff --git a/workflow/engine/methods/triggers/triggers_WizardUpdate.php b/workflow/engine/methods/triggers/triggers_WizardUpdate.php index 3200f3c87..f02be57ef 100755 --- a/workflow/engine/methods/triggers/triggers_WizardUpdate.php +++ b/workflow/engine/methods/triggers/triggers_WizardUpdate.php @@ -65,9 +65,11 @@ foreach ( $aInfoFunction as $k => $v ) { if ($aDataTriggers [$sOptionTrigger] != '') { if ((strstr ( $aDataTriggers [$sOptionTrigger], "@@" ))) { - $option = $aDataTriggers [$sOptionTrigger]; + $option = $aDataTriggers [$sOptionTrigger]; } else { - $option = "'" . $aDataTriggers [$sOptionTrigger] . "'"; + $aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]); + $option = (is_numeric($aDataTriggers [$sOptionTrigger]))?trim($aDataTriggers [$sOptionTrigger]): + (strstr($aDataTriggers [$sOptionTrigger],"array") )?trim($aDataTriggers [$sOptionTrigger]):"'" . trim($aDataTriggers [$sOptionTrigger]) . "'"; } } else { $option = "' '"; @@ -77,6 +79,7 @@ foreach ( $aInfoFunction as $k => $v ) { } } + $sPMfunction .= (isset ( $aDataTriggers ['TRI_ANSWER'] ) && $aDataTriggers ['TRI_ANSWER'] != '') ? $aDataTriggers ['TRI_ANSWER'] . " = " : ""; $sPMfunction .= $aDataTriggers ['PMFUNTION_NAME'] . " (" . implode ( ",", $methodParamsFinal ) . ");"; @@ -97,4 +100,4 @@ $oTrigger->update ( $aDataTriggers ); //Update Trigger Array $oProcessMap->triggersList($aDataTriggers['PRO_UID']); -?> \ No newline at end of file +?>