IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-25 08:21:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix tag overview.

Browse Source
This commit is contained in:
James Cole 2019-08-23 13:09:38 +02:00
parent e3a338db0e
commit 3b39fb93e7
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/v1/js/ff/transactions/list.js vendored
View File

@ -21,7 +21,7 @@
/** global: edit_selected_txt, edit_bulk_selected_txt, delete_selected_txt, token */
/**
*
* @deprecated
*/
$(document).ready(function () {
"use strict";

2
resources/views/v1/tags/show.twig
View File

@ -188,5 +188,5 @@
</script>
<script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}"></script>
<script src="v1/js/ff/tags/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

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

@ -261,8 +261,7 @@
<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>
<i class="fa fa-fw fa-tag"></i>{{ tag }}</a>
</h4>
{% endfor %}
</td>

2
routes/breadcrumbs.php
View File

@ -1092,7 +1092,7 @@ try {
$title = limitStringLength($group->title);
}
if('opening balance' === $type) {
$breadcrumbs->push($title, route('transactions.show', [$group->id]));
return;
}

4
routes/web.php
View File

@ -857,8 +857,8 @@ Route::group(
Route::get('', ['uses' => 'TagController@index', 'as' => 'index']);
Route::get('create', ['uses' => 'TagController@create', 'as' => 'create']);
Route::get('show/{tag}/all', ['uses' => 'TagController@showAll', 'as' => 'show.all']);
Route::get('show/{tag}/{start_date?}/{end_date?}', ['uses' => 'TagController@show', 'as' => 'show']);
Route::get('show/{tagOrId}/all', ['uses' => 'TagController@showAll', 'as' => 'show.all']);
Route::get('show/{tagOrId}/{start_date?}/{end_date?}', ['uses' => 'TagController@show', 'as' => 'show']);
Route::get('edit/{tag}', ['uses' => 'TagController@edit', 'as' => 'edit']);
Route::get('delete/{tag}', ['uses' => 'TagController@delete', 'as' => 'delete']);