fernando/luos
1
0
Fork 0
Code Releases Activity

Merge code from github.com to bitbucket.org 2014-06-20 12:20

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-06-20 12:23:47 -04:00
parent aebf02d698 2bd6b68cca
commit 5b63a6cfc7
7 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,6 +410,7 @@ class pmTablesProxy extends HttpProxyController
* @param string $httpData->id
* @param string $httpData->start
* @param string $httpData->limit
* @param string $httpData->appUid
*/
public function dataView ($httpData)
{
@@ -421,13 +422,14 @@ 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;
$appUid = isset( $httpData->appUid ) ? $httpData->appUid : false;
$appUid = ($appUid == "true") ? true : false;
$filter = isset( $httpData->textFilter ) ? $httpData->textFilter : '';
$additionalTables = new AdditionalTables();
$table = $additionalTables->load( $httpData->id, true );
if ($filter != '') {
$result = $additionalTables->getAllData( $httpData->id, $start, $limit, true, $filter);
$result = $additionalTables->getAllData( $httpData->id, $start, $limit, true, $filter, $appUid);
} else {
$result = $additionalTables->getAllData( $httpData->id, $start, $limit );
}