kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Code for #1324

Browse Source
This commit is contained in:
James Cole
2018-04-08 17:36:37 +02:00
parent 8f0e36a8e4
commit 3fbd2f93c8
6 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/BillController.php
View File

@@ -199,6 +199,16 @@ class BillController extends Controller
}
);
// add info about rules:
$rules = $repository->getRulesForBills($paginator->getCollection());
$bills = $bills->map(
function (array $bill) use ($rules) {
$bill['rules'] = $rules[$bill['id']] ?? [];
return $bill;
}
);
$paginator->setPath(route('bills.index'));
return view('bills.index', compact('bills', 'paginator'));

2
app/Http/Controllers/RuleController.php
View File

@@ -369,7 +369,7 @@ class RuleController extends Controller
// redirect to new bill creation.
if ((int)$request->get('bill_id') > 0) {
return redirect(route('bills.create'));
return redirect($this->getPreviousUri('bills.create.uri'));
}