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

Update various tests and the composer lock file.

Browse Source
This commit is contained in:
James Cole
2016-12-18 10:37:59 +01:00
parent 3d8adfa7e4
commit 7716ff4e8c
16 changed files with 161 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/CategoryController.php
View File

@@ -15,6 +15,7 @@ namespace FireflyIII\Http\Controllers;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Requests\CategoryFormRequest;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Category;
@@ -60,7 +61,6 @@ class CategoryController extends Controller
*/
public function create()
{
// put previous url in session if not redirect from store (not "create another").
if (session('categories.create.fromStore') !== true) {
Session::put('categories.create.url', URL::previous());
}
@@ -190,7 +190,7 @@ class CategoryController extends Controller
$subTitleIcon = 'fa-bar-chart';
// use journal collector
$collector = new JournalCollector(auth()->user());
$collector = app(JournalCollectorInterface::class);
$collector->setPage($page)->setLimit($pageSize)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category);
$journals = $collector->getPaginatedJournals();
$journals->setPath('categories/show/' . $category->id);
@@ -257,7 +257,7 @@ class CategoryController extends Controller
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
// new collector:
$collector = new JournalCollector(auth()->user());
$collector = app(JournalCollectorInterface::class);
$collector->setPage($page)->setLimit($pageSize)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category);
$journals = $collector->getPaginatedJournals();
$journals->setPath('categories/show/' . $category->id . '/' . $date);