jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

allow markdown in timesheet descriptions (#296)

Browse Source
This commit is contained in:
Kevin Papst
2018-09-02 12:10:49 +02:00
committed by GitHub
parent 9f6079ad8a
commit 4c277fe1b5
13 changed files with 77 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/admin/timesheet.html.twig
View File

@@ -61,7 +61,7 @@
<a href="{{ path('admin_activity_edit', {'id': entry.activity.id}) }}">{{ widgets.label_activity(entry.activity) }}</a>
</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'username') }}"><a href="{{ path('user_profile'|route_alias, {'username' : entry.user.username}) }}">{{ widgets.label_user(entry.user) }}</a></td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'description') }}">{{ entry.description }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'description') }}">{{ entry.description|nl2br }}</td>
<td>
{% set actionButtons = {} %}
{% if is_granted('edit', entry) %}