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

Better link for tags.

Browse Source
This commit is contained in:
James Cole
2020-04-07 18:19:29 +02:00
parent edac26f757
commit 136af9625a
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Transaction/ShowController.php
View File

@@ -108,6 +108,7 @@ class ShowController extends Controller
if (!Str::contains($transaction['notes'], $search)) {
$groupArray['transactions'][$index]['notes'] = e($transaction['notes']);
}
$groupArray['transactions'][$index]['tags'] = $this->repository->getTagObjects($groupArray['transactions'][$index]['transaction_journal_id']);
}
$events = $this->repository->getPiggyEvents($transactionGroup);

12
app/Repositories/TransactionGroup/TransactionGroupRepository.php
View File

@@ -45,6 +45,7 @@ use FireflyIII\Services\Internal\Update\GroupUpdateService;
use FireflyIII\Support\NullArrayObject;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Collection;
use Log;
/**
@@ -468,4 +469,15 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
return $return;
}
/**
* @inheritDoc
*/
public function getTagObjects(int $journalId): Collection
{
/** @var TransactionJournal $journal */
$journal = $this->user->transactionJournals()->find($journalId);
return $journal->tags()->get();
}
}

10
app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Support\NullArrayObject;
use FireflyIII\User;
use Illuminate\Support\Collection;
/**
* Interface TransactionGroupRepositoryInterface
@@ -122,6 +123,15 @@ interface TransactionGroupRepositoryInterface
*/
public function getTags(int $journalId): array;
/**
* Get the tags for a journal (by ID) as Tag objects.
*
* @param int $journalId
*
* @return Collection
*/
public function getTagObjects(int $journalId): Collection;
/**
* Set the user.
*

4
resources/views/v1/transactions/show.twig
View File

@@ -260,8 +260,8 @@
<td>{{ 'tags'|_ }}</td>
<td>
{% for tag in journal.tags %}
<h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show', tag) }}">
<i class="fa fa-fw fa-tag"></i>{{ tag }}</a>
<h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show', tag.id) }}">
<i class="fa fa-fw fa-tag"></i>{{ tag.tag }}</a>
</h4>
{% endfor %}
</td>