kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 05:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Some CSS and style updates.

Browse Source
This commit is contained in:
James Cole
2014-09-21 12:30:00 +02:00
parent 0770c79777
commit 802541b796
7 changed files with 501 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/JsonController.php
View File

@@ -110,7 +110,7 @@ class JsonController extends BaseController
*/
$parameters = [
'start' => intval(Input::get('start')),
'length' => intval(Input::get('length')),
'length' => intval(Input::get('length')) < 0 ? 100000 : intval(Input::get('length')),
'draw' => intval(Input::get('draw')),
];
@@ -294,13 +294,23 @@ class JsonController extends BaseController
$query->take($parameters['length']);
$query->skip($parameters['start']);
/*
* Input search parameters:
*/
$filtered = $count;
if(strlen($parameters['search']['value']) > 0) {
$query->where('transaction_journals.description','LIKE','%'.e($parameters['search']['value']).'%');
$filtered = $query->count();
}
/*
* Build return array:
*/
$data = [
'draw' => $parameters['draw'],
'recordsTotal' => $count,
'recordsFiltered' => $count,
'recordsFiltered' => $filtered,
'data' => [],
];