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

Merge pull request #205 from julceslauhub/master

Browse Source 
BUG 9287 The variable picker for the trigger editor does not show grid variables in the list
This commit is contained in:
julceslauhub
2012-07-09 19:45:49 -07:00
parent 18b0f778fc 4ac41f87ad
commit 5b420d115a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.xmlfield_InputPM.php
View File

@@ -361,7 +361,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText
* @parameter boolean $bSystemVars * @parameter boolean $bSystemVars
* @return array * @return array
*/ */
function getDynaformsVars($sProcessUID, $bSystemVars = true, $bIncMulSelFields = false) function getDynaformsVars($sProcessUID, $bSystemVars = true, $bIncMulSelFields = 0)
{ {
$aFields = array(); $aFields = array();
$aFieldsNames = 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'); $aInvalidTypes = array('title', 'subtitle', 'link', 'file', 'button', 'reset', 'submit', 'javascript');
$aMultipleSelectionFields = array('listbox', 'checkgroup', 'grid'); $aMultipleSelectionFields = array('listbox', 'checkgroup', 'grid');
if (!$bIncMulSelFields) { if ($bIncMulSelFields != 0) {
$aInvalidTypes = array_merge($aInvalidTypes, $aMultipleSelectionFields); $aInvalidTypes = array_merge($aInvalidTypes, $aMultipleSelectionFields);
} }
require_once 'classes/model/Dynaform.php'; require_once 'classes/model/Dynaform.php';
@@ -395,7 +395,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText
if (!in_array($k, $aFieldsNames)) { if (!in_array($k, $aFieldsNames)) {
$aFields[] = array('sName' => $k, $aFields[] = array('sName' => $k,
'sType' => $v->type, 'sType' => $v->type,
'sLabel'=> $v->label 'sLabel'=> ($v->type != 'grid' ? $v->label : '[ ' . G::LoadTranslation('ID_GRID') . ' ]')
); );
$aFieldsNames[] = $k; $aFieldsNames[] = $k;
} }

2
workflow/engine/js/controls/varsAjax.js
View File

@@ -19,7 +19,7 @@ var changeVariables = function(varType,proUid,field,symbol,target) {
url : '../controls/varsAjaxByType', url : '../controls/varsAjaxByType',
async : true, async : true,
method: 'POST', 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){ oRPC.callback = function(rpc){

2
workflow/engine/methods/controls/varsAjax.php
View File

@@ -23,7 +23,7 @@
* *
*/ */
G::LoadClass('xmlfield_InputPM'); 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 = '<select name="_Var_Form_" id="_Var_Form_" size="' . count($aFields) . '" style="width:100%;' . (! isset($_POST['sNoShowLeyend']) ? 'height:50%;' : '') . '" ondblclick="insertFormVar(\'' . $_POST['sFieldName'] . '\', this.value);">'; $sHTML = '<select name="_Var_Form_" id="_Var_Form_" size="' . count($aFields) . '" style="width:100%;' . (! isset($_POST['sNoShowLeyend']) ? 'height:50%;' : '') . '" ondblclick="insertFormVar(\'' . $_POST['sFieldName'] . '\', this.value);">';
foreach ( $aFields as $aField ) { foreach ( $aFields as $aField ) {

2
workflow/engine/methods/controls/varsAjaxByType.php
View File

@@ -35,7 +35,7 @@
*/ */
G::LoadClass('xmlfield_InputPM'); 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);
$aType = $_POST['type']; $aType = $_POST['type'];
$aRows[0] = Array ( $aRows[0] = Array (