diff --git a/workflow/engine/js/controls/variablePicker.js b/workflow/engine/js/controls/variablePicker.js index a54beeb49..0293c65b2 100644 --- a/workflow/engine/js/controls/variablePicker.js +++ b/workflow/engine/js/controls/variablePicker.js @@ -4,20 +4,17 @@ var getValue = function (list) { var getVariableList = function (queryText, proUid, varType){ varType = varType.toLowerCase(); - var response + var responseData var oRPC = new leimnud.module.rpc.xmlhttp({ url : "../processes/processes_Ajax", async : false, method: "POST", args : "action=getVariableList&process="+proUid+"&queryText="+queryText+"&type="+varType - }); - oRPC.callback = function(rpc){ - console.log(rpc.xmlhttp.responseText); - response = eval(rpc.xmlhttp.responseText); - }.extend(this); + }); - oRPC.make(); - console.log(response); + oRPC.make(); + responseData = eval ("(" +oRPC.xmlhttp.responseText+ ")"); + return responseData; } leimnud.event.add(document.getElementById('type_variables'), 'change', function(event) { @@ -29,21 +26,25 @@ leimnud.event.add(document.getElementById('prefix'), 'change', function(event) { }); -leimnud.event.add(document.getElementById('search'), 'keypress', function(event) { - var tecla = event.keyCode; - if(tecla == '13') +leimnud.event.add(document.getElementById('search'), 'keypress', function(e) { + var key = e.keyCode; + if(key == '13') { var list = getVariableList('nuev','2527075735085b447a58523099748463','system'); - console.log(list); - for (var i in list){ - console.log(list[i]); + for (var i=0; i< list.length; i++){ + console.log(list[i].sName); + } + e.cancelBubble = true; + e.returnValue = false; + if (e.stopPropagation) { + e.stopPropagation(); + e.preventDefault(); } - console.log('Has pulsado enter'); return false; } }); leimnud.event.add(document.getElementById('type_variables'), 'change', function(event) { - console.log('Dropdown Type of Variables'); + console.log('Dropdown Type of Variables'); }); diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php index 63b1c2005..7140daf7b 100755 --- a/workflow/engine/methods/controls/varsAjax.php +++ b/workflow/engine/methods/controls/varsAjax.php @@ -71,8 +71,7 @@ $html .= ''; $html .= '     '; $html .= ''; -$html .= ''; -//$html .= ''; +$html .= ''; $html .= ''; $html .= ''; $html .= ''; diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index 2c1c1ef42..8e5631a36 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -522,16 +522,17 @@ try { case 'getVariableList': G::LoadClass( 'xmlfield_InputPM' ); $proUid= isset($_REQUEST['process'])?$_REQUEST['process']:''; + $queryText= isset($_REQUEST['queryText'])?$_REQUEST['queryText']:''; $aFields = getDynaformsVars( $proUid, true, isset( $_REQUEST['bIncMulSelFields'] ) ? $_REQUEST['bIncMulSelFields'] : 0 ); - $_REQUEST['queryString'] = 'SYS'; + //$_REQUEST['queryString'] = 'SYS'; $aVariables = array(); foreach ($aFields as $key => $value) { - if(stristr($aFields[$key]['sName'], $_REQUEST['queryString'])){ + if(stristr($aFields[$key]['sName'], $queryText)){ $aVariables[] = $aFields[$key]; } } $oJSON = new Services_JSON(); - echo $oJSON->encode($aFields); + echo $oJSON->encode($aVariables); break; /* case 'saveFile':