diff --git a/workflow/engine/classes/class.xmlfield_InputPM.php b/workflow/engine/classes/class.xmlfield_InputPM.php index aff372876..1d4b22ddf 100755 --- a/workflow/engine/classes/class.xmlfield_InputPM.php +++ b/workflow/engine/classes/class.xmlfield_InputPM.php @@ -361,7 +361,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText * @parameter boolean $bSystemVars * @return array */ - function getDynaformsVars($sProcessUID, $bSystemVars = true, $bIncMulSelFields = false) + function getDynaformsVars($sProcessUID, $bSystemVars = true, $bIncMulSelFields = 0) { $aFields = array(); $aFieldsNames = array(); @@ -375,7 +375,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText } $aInvalidTypes = array('title', 'subtitle', 'link', 'file', 'button', 'reset', 'submit', 'javascript'); $aMultipleSelectionFields = array('listbox', 'checkgroup', 'grid'); - if (!$bIncMulSelFields) { + if ($bIncMulSelFields != 0) { $aInvalidTypes = array_merge($aInvalidTypes, $aMultipleSelectionFields); } require_once 'classes/model/Dynaform.php'; @@ -395,7 +395,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText if (!in_array($k, $aFieldsNames)) { $aFields[] = array('sName' => $k, 'sType' => $v->type, - 'sLabel'=> $v->label + 'sLabel'=> ($v->type != 'grid' ? $v->label : '[ ' . G::LoadTranslation('ID_GRID') . ' ]') ); $aFieldsNames[] = $k; } diff --git a/workflow/engine/js/controls/varsAjax.js b/workflow/engine/js/controls/varsAjax.js index 3b0c53414..9e88fae0d 100755 --- a/workflow/engine/js/controls/varsAjax.js +++ b/workflow/engine/js/controls/varsAjax.js @@ -19,7 +19,7 @@ var changeVariables = function(varType,proUid,field,symbol,target) { url : '../controls/varsAjaxByType', async : true, method: 'POST', - args : "type="+varType+"&sProcess="+proUid+"&sFieldName="+field+"&sSymbol="+symbol+"&bIncMulSelFields=1" + args : "type="+varType+"&sProcess="+proUid+"&sFieldName="+field+"&sSymbol="+symbol+"&bIncMulSelFields=0" }); oRPC.callback = function(rpc){ diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php index 59021fae3..1e5f251d0 100755 --- a/workflow/engine/methods/controls/varsAjax.php +++ b/workflow/engine/methods/controls/varsAjax.php @@ -23,7 +23,7 @@ * */ G::LoadClass('xmlfield_InputPM'); -$aFields = getDynaformsVars($_POST['sProcess'], true, isset($_POST['bIncMulSelFields']) ? (boolean)$_POST['bIncMulSelFields'] : false); +$aFields = getDynaformsVars($_POST['sProcess'], true, isset($_POST['bIncMulSelFields']) ? $_POST['bIncMulSelFields'] : 0); $sHTML = '