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

This fixes #501

Browse Source
This commit is contained in:
James Cole
2016-12-28 05:16:55 +01:00
parent 02e792148c
commit 6521a7c604
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Twig/Journal.php
View File

@@ -253,12 +253,12 @@ class Journal extends Twig_Extension
$budgets = []; $budgets = [];
// get all budgets: // get all budgets:
foreach ($journal->budgets as $budget) { foreach ($journal->budgets as $budget) {
$budgets[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($budget->name), route('accounts.show', $budget->id)); $budgets[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($budget->name), route('budgets.show', $budget->id));
} }
// and more! // and more!
foreach ($journal->transactions as $transaction) { foreach ($journal->transactions as $transaction) {
foreach ($transaction->budgets as $budget) { foreach ($transaction->budgets as $budget) {
$budgets[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($budget->name), route('accounts.show', $budget->id)); $budgets[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($budget->name), route('budgets.show', $budget->id));
} }
} }
$string = join(', ', array_unique($budgets)); $string = join(', ', array_unique($budgets));
@@ -288,7 +288,7 @@ class Journal extends Twig_Extension
$categories = []; $categories = [];
// get all categories for the journal itself (easy): // get all categories for the journal itself (easy):
foreach ($journal->categories as $category) { foreach ($journal->categories as $category) {
$categories[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($category->name), route('accounts.show', $category->id)); $categories[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($category->name), route('categories.show', $category->id));
} }
if (count($categories) === 0) { if (count($categories) === 0) {
$set = Category::distinct()->leftJoin('category_transaction', 'categories.id', '=', 'category_transaction.category_id') $set = Category::distinct()->leftJoin('category_transaction', 'categories.id', '=', 'category_transaction.category_id')
@@ -299,7 +299,7 @@ class Journal extends Twig_Extension
->get(['categories.*']); ->get(['categories.*']);
/** @var Category $category */ /** @var Category $category */
foreach ($set as $category) { foreach ($set as $category) {
$categories[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($category->name), route('accounts.show', $category->id)); $categories[] = sprintf('<a title="%1$s" href="%2$s">%1$s</a>', e($category->name), route('categories.show', $category->id));
} }
} }