fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/HOR-1421 (pull request #4594)

Browse Source 
HOR-1421
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-21 12:23:08 -04:00
parent e21e9700f9 fbdd4f6a18
commit a88a7f8f1f
3 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/ProcessMaker/BusinessModel/Table.php
View File

@@ -150,7 +150,7 @@ class Table
*
* @return array
*/
public function getTableData($tab_uid, $pro_uid = '', $filter = null, $reportFlag = false)
public function getTableData($tab_uid, $pro_uid = '', $filter = null, $reportFlag = false, $search = '')
{
//Validation
$inputFilter = new \InputFilter();
@@ -164,7 +164,7 @@ class Table
$additionalTables = new AdditionalTables();
$table = $additionalTables->load($tab_uid, true);
$result = $additionalTables->getAllData($tab_uid, null, null, null, $filter);
$result = $additionalTables->getAllData($tab_uid, null, null, null, $filter, false, $search);
$primaryKeys = $additionalTables->getPrimaryKeys();
if (is_array($result['rows'])) {
foreach ($result['rows'] as $i => $row) {