fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1254 from hector-cortez/BUG-0000

Browse Source 
BUG 0000 Problems in the wizard of the triggers, fields type were not validation
This commit is contained in:
julceslauhub
2013-01-29 13:10:24 -08:00
parent 5a97a3afb2 3b2d9f6914
commit 62d80af406
6 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
workflow/engine/methods/triggers/triggers_WizardSave.php
View File

@@ -34,6 +34,7 @@ $oProcessMap = new processMap( new DBConnection() );
$aDataTriggers = $_POST; $aDataTriggers = $_POST;
$aInfoFunction = explode( ",", $aDataTriggers['ALLFUNCTION'] ); $aInfoFunction = explode( ",", $aDataTriggers['ALLFUNCTION'] );
$aInfoFunctionType = explode( ",", $aDataTriggers['ALLFUNCTION_TYPE'] );
$sPMfunction = " $sPMfunction = "
/*************************************************** /***************************************************
@@ -51,6 +52,7 @@ $sPMfunction = "
$methodParamsFinal = array (); $methodParamsFinal = array ();
//Generate params to send //Generate params to send
$i = 0;
foreach ($aInfoFunction as $k => $v) { foreach ($aInfoFunction as $k => $v) {
if ($v != '') { if ($v != '') {
@@ -64,8 +66,25 @@ foreach ($aInfoFunction as $k => $v) {
if ((strstr( $aDataTriggers[$sOptionTrigger], "@@" ))) { if ((strstr( $aDataTriggers[$sOptionTrigger], "@@" ))) {
$option = trim( $aDataTriggers[$sOptionTrigger] ); $option = trim( $aDataTriggers[$sOptionTrigger] );
} else { } else {
$aDataTriggers[$sOptionTrigger] = (strstr( $aDataTriggers[$sOptionTrigger], 'array' )) ? str_replace( "'", '"', $aDataTriggers[$sOptionTrigger] ) : str_replace( "'", "\'", $aDataTriggers[$sOptionTrigger] ); $aDataTriggers[$sOptionTrigger] = (strstr( $aDataTriggers[$sOptionTrigger], 'array' )) ? str_replace( "'", '"', $aDataTriggers[$sOptionTrigger] ) : str_replace( "'", "\'", $aDataTriggers[$sOptionTrigger] );
$option = (is_numeric( $aDataTriggers[$sOptionTrigger] )) ? trim( $aDataTriggers[$sOptionTrigger] ) : (strstr( $aDataTriggers[$sOptionTrigger], "array" )) ? trim( $aDataTriggers[$sOptionTrigger] ) : "'" . trim( $aDataTriggers[$sOptionTrigger] ) . "'"; switch(trim($aInfoFunctionType[$i])) {
case 'boolean' :
$option = $aDataTriggers[$sOptionTrigger];
break;
case 'int' :
$option = intval($aDataTriggers[$sOptionTrigger]);
break;
case 'float' :
case 'real' :
case 'double' :
$option = floatval($aDataTriggers[$sOptionTrigger]);
break;
default:
$option = (is_numeric( $aDataTriggers[$sOptionTrigger] ) || is_bool($aDataTriggers[$sOptionTrigger]) ) ? trim( $aDataTriggers[$sOptionTrigger] ) : (strstr( $aDataTriggers[$sOptionTrigger], "array" )) ? trim( $aDataTriggers[$sOptionTrigger] ) : "'" . trim( $aDataTriggers[$sOptionTrigger] ) . "'";
break;
}
} }
} else { } else {
$option = "''"; $option = "''";
@@ -73,7 +92,7 @@ foreach ($aInfoFunction as $k => $v) {
$methodParamsFinal[] = $option; $methodParamsFinal[] = $option;
} }
$i++;
} }
//G::pr($methodParamsFinal);die; //G::pr($methodParamsFinal);die;
$sPMfunction .= (isset( $aDataTriggers['TRI_ANSWER'] ) && $aDataTriggers['TRI_ANSWER'] != '') ? $aDataTriggers['TRI_ANSWER'] . " = " : ""; $sPMfunction .= (isset( $aDataTriggers['TRI_ANSWER'] ) && $aDataTriggers['TRI_ANSWER'] != '') ? $aDataTriggers['TRI_ANSWER'] . " = " : "";

23
workflow/engine/methods/triggers/triggers_WizardUpdate.php
View File

@@ -37,7 +37,7 @@ $aDataTriggers = $_POST;
$triUid = $_POST['TRI_UID']; $triUid = $_POST['TRI_UID'];
$aInfoFunction = explode( ",", $aDataTriggers['ALLFUNCTION'] ); $aInfoFunction = explode( ",", $aDataTriggers['ALLFUNCTION'] );
$aInfoFunctionType = explode( ",", $aDataTriggers['ALLFUNCTION_TYPE'] );
$sPMfunction = " $sPMfunction = "
/*************************************************** /***************************************************
* *
@@ -52,8 +52,10 @@ $sPMfunction = "
"; ";
$methodParamsFinal = array (); $methodParamsFinal = array ();
//Generate params to send //Generate params to send
$i = 0;
foreach ($aInfoFunction as $k => $v) { foreach ($aInfoFunction as $k => $v) {
if ($v != '') { if ($v != '') {
@@ -69,8 +71,23 @@ foreach ($aInfoFunction as $k => $v) {
} else { } else {
$aDataTriggers[$sOptionTrigger] = (strstr( $aDataTriggers[$sOptionTrigger], 'array' )) ? str_replace( "'", '"', $aDataTriggers[$sOptionTrigger] ) : str_replace( "'", "\'", $aDataTriggers[$sOptionTrigger] ); $aDataTriggers[$sOptionTrigger] = (strstr( $aDataTriggers[$sOptionTrigger], 'array' )) ? str_replace( "'", '"', $aDataTriggers[$sOptionTrigger] ) : str_replace( "'", "\'", $aDataTriggers[$sOptionTrigger] );
switch(trim($aInfoFunctionType[$i])) {
case 'boolean' :
$option = $aDataTriggers[$sOptionTrigger];
break;
case 'int' :
$option = intval($aDataTriggers[$sOptionTrigger]);
break;
case 'float' :
case 'real' :
case 'double' :
$option = floatval($aDataTriggers[$sOptionTrigger]);
break;
default:
$option = (is_numeric( $aDataTriggers[$sOptionTrigger] ) || is_bool($aDataTriggers[$sOptionTrigger]) ) ? trim( $aDataTriggers[$sOptionTrigger] ) : (strstr( $aDataTriggers[$sOptionTrigger], "array" )) ? trim( $aDataTriggers[$sOptionTrigger] ) : "'" . trim( $aDataTriggers[$sOptionTrigger] ) . "'";
break;
}
$option = (is_numeric( $aDataTriggers[$sOptionTrigger] )) ? trim( $aDataTriggers[$sOptionTrigger] ) : (strstr( $aDataTriggers[$sOptionTrigger], "array" )) ? trim( $aDataTriggers[$sOptionTrigger] ) : "'" . trim( $aDataTriggers[$sOptionTrigger] ) . "'";
} }
} else { } else {
$option = "' '"; $option = "' '";
@@ -78,7 +95,7 @@ foreach ($aInfoFunction as $k => $v) {
$methodParamsFinal[] = $option; $methodParamsFinal[] = $option;
} }
$i++;
} }
$sPMfunction .= (isset( $aDataTriggers['TRI_ANSWER'] ) && $aDataTriggers['TRI_ANSWER'] != '') ? $aDataTriggers['TRI_ANSWER'] . " = " : ""; $sPMfunction .= (isset( $aDataTriggers['TRI_ANSWER'] ) && $aDataTriggers['TRI_ANSWER'] != '') ? $aDataTriggers['TRI_ANSWER'] . " = " : "";

1
workflow/engine/templates/triggers/triggers_CreateWizard.html
View File

@@ -117,6 +117,7 @@
<input type="hidden" name="PMFUNTION_NAME" value="{PMFUNTION}"> <input type="hidden" name="PMFUNTION_NAME" value="{PMFUNTION}">
<input type="hidden" name="LIBRARY_CLASS" value="{LIBRARY_CLASS}"> <input type="hidden" name="LIBRARY_CLASS" value="{LIBRARY_CLASS}">
<input type="hidden" id="PRO_UID" name="PRO_UID" value="{PRO_UID}"> <input type="hidden" id="PRO_UID" name="PRO_UID" value="{PRO_UID}">
<input type="hidden" id="ALLFUNCTION_TYPE" name="ALLFUNCTION_TYPE" value="{ALLFUNCTION_TYPE}">
<input type="hidden" id="ALLFUNCTION" name="ALLFUNCTION" value="{ALLFUNCTION}"> <input type="hidden" id="ALLFUNCTION" name="ALLFUNCTION" value="{ALLFUNCTION}">
<input type="hidden" name="PAGED_TABLE_ID" id="PAGED_TABLE_ID" value="{PAGED_TABLE_ID}"> <input type="hidden" name="PAGED_TABLE_ID" id="PAGED_TABLE_ID" value="{PAGED_TABLE_ID}">
<input type="hidden" name="LIBRARY_NAME" id="LIBRARY_NAME" value="{LIBRARY_NAME}"> <input type="hidden" name="LIBRARY_NAME" id="LIBRARY_NAME" value="{LIBRARY_NAME}">

15
workflow/engine/templates/triggers/triggers_CreateWizard.php
View File

@@ -75,7 +75,7 @@ try {
$bReturnValue = false; $bReturnValue = false;
$displayMode = 'display:none'; $displayMode = 'display:none';
} }
$aParametersFun = $methodParameters; $aParametersFun = $methodParameters;
$triggerWizardTemplate = PATH_TPL . 'triggers' . PATH_SEP . 'triggers_CreateWizard.html'; $triggerWizardTemplate = PATH_TPL . 'triggers' . PATH_SEP . 'triggers_CreateWizard.html';
$template = new TemplatePower ( $triggerWizardTemplate ); $template = new TemplatePower ( $triggerWizardTemplate );
@@ -118,7 +118,7 @@ try {
$sPMfunction = $sNameFun . " ("; $sPMfunction = $sNameFun . " (";
$methodParametersOnlyNames = array (); $methodParametersOnlyNames = array ();
$methodParametersNamesType = array ();
if (count ( $aParametersFun ) > 0) { if (count ( $aParametersFun ) > 0) {
$template->newBlock ( 'paremetersTriggersGroup' ); $template->newBlock ( 'paremetersTriggersGroup' );
$template->assign ( 'PARAMETERS_LABEL', G::LoadTranslation ( 'ID_PARAMETERS' ) ); $template->assign ( 'PARAMETERS_LABEL', G::LoadTranslation ( 'ID_PARAMETERS' ) );
@@ -126,11 +126,12 @@ try {
if ($v != '') { if ($v != '') {
$aParametersFunA = explode ( "|", $v ); $aParametersFunA = explode ( "|", $v );
$paramType = $aParametersFunA [0]; $paramType = $aParametersFunA [0];
$methodParametersNamesType[] = $paramType;
$paramDefinition = $aParametersFunA [1]; $paramDefinition = $aParametersFunA [1];
$paramDefinitionA = explode ( "=", $paramDefinition ); $paramDefinitionA = explode ( "=", $paramDefinition );
$paramName = $paramDefinitionA [0]; $paramName = $paramDefinitionA [0];
$methodParametersOnlyNames [] = $paramName; $methodParametersOnlyNames [] = $paramName;
$paramDefaultValue = isset ( $paramDefinitionA [1] ) ? $paramDefinitionA [1] : ""; $paramDefaultValue = (isset($paramDefinitionA[1]))? trim($paramDefinitionA[1]) : "";
$paramLabel = isset ( $aParametersFunA [2] ) ? $aParametersFunA [2] : $paramName; $paramLabel = isset ( $aParametersFunA [2] ) ? $aParametersFunA [2] : $paramName;
$paramDescription = isset ( $aParametersFunA [3] ) ? $aParametersFunA [3] : ""; $paramDescription = isset ( $aParametersFunA [3] ) ? $aParametersFunA [3] : "";
$sPMfunction .= ($nrows != 2) $sPMfunction .= ($nrows != 2)
@@ -147,9 +148,8 @@ try {
. "onclick='showDynaformsFormVars($sNameTag , \"../controls/varsAjax\" , " . "onclick='showDynaformsFormVars($sNameTag , \"../controls/varsAjax\" , "
. " \"$sProUid\" , \"@@\");return;' >"; . " \"$sProUid\" , \"@@\");return;' >";
$template->assign ( 'ADD_TRI_VARIABLE', $tri_Button ); $template->assign("ADD_TRI_VARIABLE", $tri_Button);
$template->assign ( 'ADD_TRI_VALUE', $template->assign("ADD_TRI_VALUE", str_replace(array("\"", "'"), array(null, null), $paramDefaultValue));
str_replace ( "'", "", str_replace ( '"', '', $paramDefaultValue ) ) );
$fieldDescription = ($paramDescription!="")?$paramDescription . "<br>":""; $fieldDescription = ($paramDescription!="")?$paramDescription . "<br>":"";
if ($paramDefaultValue != "") { if ($paramDefaultValue != "") {
@@ -166,6 +166,7 @@ try {
$template->gotoBlock ( '_ROOT' ); $template->gotoBlock ( '_ROOT' );
$template->assign ('FIELDS_REQUIRED', implode ( ",", $fieldRequired )); $template->assign ('FIELDS_REQUIRED', implode ( ",", $fieldRequired ));
$template->assign ( 'ALLFUNCTION_TYPE', implode ( ",", $methodParametersNamesType ) );
$template->assign ( 'ALLFUNCTION', implode ( ",", $methodParametersOnlyNames ) ); $template->assign ( 'ALLFUNCTION', implode ( ",", $methodParametersOnlyNames ) );
$sPMfunction .= ");"; $sPMfunction .= ");";
$content = $template->getOutputContent (); $content = $template->getOutputContent ();
@@ -174,4 +175,6 @@ try {
} catch ( Exception $oException ) { } catch ( Exception $oException ) {
die ( $oException->getMessage () ); die ( $oException->getMessage () );
} }
unset ($_SESSION ['PROCESS']); unset ($_SESSION ['PROCESS']);

1
workflow/engine/templates/triggers/triggers_EditWizard.html
View File

@@ -124,6 +124,7 @@
<input type="hidden" name="PMFUNTION_NAME" value="{PMFUNTION}"> <input type="hidden" name="PMFUNTION_NAME" value="{PMFUNTION}">
<input type="hidden" name="LIBRARY_CLASS" value="{LIBRARY_CLASS}"> <input type="hidden" name="LIBRARY_CLASS" value="{LIBRARY_CLASS}">
<input type="hidden" id="PRO_UID" name="PRO_UID" value="{PRO_UID}"> <input type="hidden" id="PRO_UID" name="PRO_UID" value="{PRO_UID}">
<input type="hidden" id="ALLFUNCTION_TYPE" name="ALLFUNCTION_TYPE" value="{ALLFUNCTION_TYPE}">
<input type="hidden" id="ALLFUNCTION" name="ALLFUNCTION" value="{ALLFUNCTION}"> <input type="hidden" id="ALLFUNCTION" name="ALLFUNCTION" value="{ALLFUNCTION}">
<input type="hidden" name="PAGED_TABLE_ID" id="PAGED_TABLE_ID" value="{PAGED_TABLE_ID}"> <input type="hidden" name="PAGED_TABLE_ID" id="PAGED_TABLE_ID" value="{PAGED_TABLE_ID}">
<input type="hidden" name="LIBRARY_NAME" id="LIBRARY_NAME" value="{LIBRARY_NAME}"> <input type="hidden" name="LIBRARY_NAME" id="LIBRARY_NAME" value="{LIBRARY_NAME}">

3
workflow/engine/templates/triggers/triggers_EditWizard.php
View File

@@ -120,6 +120,7 @@ try {
$sPMfunction = $sNameFun . " ("; $sPMfunction = $sNameFun . " (";
$methodParametersOnlyNames = array (); $methodParametersOnlyNames = array ();
$methodParametersNamesType = array ();
if (count ( $aParametersFun ) > 0) { if (count ( $aParametersFun ) > 0) {
$template->newBlock ( 'paremetersTriggersGroup' ); $template->newBlock ( 'paremetersTriggersGroup' );
$template->assign ( 'PARAMETERS_LABEL', G::LoadTranslation ( 'ID_PARAMETERS' ) ); $template->assign ( 'PARAMETERS_LABEL', G::LoadTranslation ( 'ID_PARAMETERS' ) );
@@ -127,6 +128,7 @@ try {
if ($v != '') { if ($v != '') {
$aParametersFunA = explode ( "|", $v ); $aParametersFunA = explode ( "|", $v );
$paramType = $aParametersFunA [0]; $paramType = $aParametersFunA [0];
$methodParametersNamesType[] = $paramType;
$paramDefinition = $aParametersFunA [1]; $paramDefinition = $aParametersFunA [1];
$paramDefinitionA = explode ( "=", $paramDefinition ); $paramDefinitionA = explode ( "=", $paramDefinition );
$paramName = $paramDefinitionA [0]; $paramName = $paramDefinitionA [0];
@@ -172,6 +174,7 @@ try {
} }
$template->gotoBlock ( '_ROOT' ); $template->gotoBlock ( '_ROOT' );
$template->assign ('FIELDS_REQUIRED', implode ( ",", $fieldRequired )); $template->assign ('FIELDS_REQUIRED', implode ( ",", $fieldRequired ));
$template->assign ( 'ALLFUNCTION_TYPE', implode ( ",", $methodParametersNamesType ) );
$template->assign ( 'ALLFUNCTION', implode ( ",", $methodParametersOnlyNames ) ); $template->assign ( 'ALLFUNCTION', implode ( ",", $methodParametersOnlyNames ) );
$sPMfunction .= ");"; $sPMfunction .= ");";
$content = $template->getOutputContent (); $content = $template->getOutputContent ();