kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 11:19:16 +00:00
Code Issues Projects Releases Wiki Activity

Clean up code, clarify 404.

Browse Source
This commit is contained in:
James Cole
2023-12-30 09:56:03 +01:00
parent be8aaa68af
commit 5178e19cea
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Report/TagController.php
View File

@@ -31,7 +31,6 @@ use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Tag\OperationsRepositoryInterface; use FireflyIII\Repositories\Tag\OperationsRepositoryInterface;
use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\Factory;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View; use Illuminate\View\View;
/** /**
@@ -446,6 +445,7 @@ class TagController extends Controller
} }
} }
} }
return view('reports.tag.partials.tags', compact('sums', 'report')); return view('reports.tag.partials.tags', compact('sums', 'report'));
} }

4
app/Repositories/Tag/OperationsRepository.php
View File

@@ -80,7 +80,7 @@ class OperationsRepository implements OperationsRepositoryInterface
$tagId = (int)$tag['id']; $tagId = (int)$tag['id'];
$tagName = (string)$tag['name']; $tagName = (string)$tag['name'];
$journalId = (int)$journal['transaction_journal_id']; $journalId = (int)$journal['transaction_journal_id'];
if(!in_array($tagId, $tagIds, true)){ if(!in_array($tagId, $tagIds, true)) {
continue; continue;
} }
@@ -160,7 +160,7 @@ class OperationsRepository implements OperationsRepositoryInterface
// may have multiple tags: // may have multiple tags:
foreach ($journal['tags'] as $tag) { foreach ($journal['tags'] as $tag) {
if(!in_array($tagId, $tagIds, true)){ if(!in_array($tagId, $tagIds, true)) {
continue; continue;
} }
$tagId = (int)$tag['id']; $tagId = (int)$tag['id'];

5
resources/views/errors/404.twig
View File

@@ -37,6 +37,11 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
{% if exception.message starts with 'Webhooks' %}
<p class="lead">
{{ exception.message }}
</p>
{% endif %}
<p> <p>
{{ trans('errors.404_page_does_not_exist') }} {{ trans('errors.404_page_does_not_exist') }}
</p> </p>