Merged in dheeyi/processmaker/HOR-1861 (pull request #4906)

HOR-1861
This commit is contained in:
Julio Cesar Laura Avendaño
2016-09-16 14:59:11 -04:00

View File

@@ -1270,7 +1270,7 @@ class pmTablesProxy extends HttpProxyController
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();
$excludeFieldsList = array ('title','subtitle','link','file','button','reset','submit','listbox','checkgroup','grid','javascript','location','scannerCode','array'
$excludeFieldsList = array ('multipleFile','title','subtitle','link','file','button','reset','submit','listbox','checkgroup','grid','javascript','location','scannerCode','array'
);
$labelFieldsTypeList = array ('dropdown','radiogroup');
@@ -1321,7 +1321,7 @@ class pmTablesProxy extends HttpProxyController
switch ($type) {
case 'xmlform':
$arrayDataTypeToExclude = ['array', 'grid'];
$arrayTypeToExclude = ['title', 'subtitle', 'link', 'file', 'button', 'reset', 'submit', 'listbox', 'grid', 'array', 'javascript', 'location', 'scannerCode'];
$arrayTypeToExclude = ['multipleFile', 'title', 'subtitle', 'link', 'file', 'button', 'reset', 'submit', 'listbox', 'grid', 'array', 'javascript', 'location', 'scannerCode'];
$arrayControlSupported = [];