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

Merge branch 'master' of github.com:colosa/processmaker

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-10-22 11:18:31 -04:00
parent 3bbb57709c 7319e1cd43
commit 0a2ed31b8b
17 changed files with 237 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -416,10 +416,16 @@ class pmTablesProxy extends HttpProxyController
$limit_size = isset( $config['pageSize'] ) ? $config['pageSize'] : 20;
$start = isset( $httpData->start ) ? $httpData->start : 0;
$limit = isset( $httpData->limit ) ? $httpData->limit : $limit_size;
$filter = isset( $httpData->textFilter ) ? $httpData->textFilter : '';
$additionalTables = new AdditionalTables();
$table = $additionalTables->load( $httpData->id, true );
$result = $additionalTables->getAllData( $httpData->id, $start, $limit );
if ($filter != '') {
$result = $additionalTables::getAllData( $httpData->id, $start, $limit, true, $filter);
} else {
$result = $additionalTables->getAllData( $httpData->id, $start, $limit );
}
$primaryKeys = $additionalTables->getPrimaryKeys();