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

beta 3 (#3780)

Browse Source 
* merge master - allow to upload twig invoice templates via UI
* support adding existing teams with same name
* permissions cannot be set right after role was created - fixes #3777
* allow to deactivate unique customer number validation - fixes #3762 
* invalid message when trying to edit locked or exported timesheets in calendar - fixes #3766
* updated icons and manifest - fixes #3761
This commit is contained in:
Kevin Papst
2023-01-21 14:49:55 +01:00
committed by GitHub
parent b62253e1f3
commit a230be77dd
79 changed files with 428 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/calendar/user.html.twig
View File

@@ -69,6 +69,7 @@
{% set editRoute = 'timesheet_edit' %}
{% set canCreate = is_granted('create_own_timesheet') %}
{% set canEdit = is_granted('edit_own_timesheet') %}
{% set canEditExported = is_granted('edit_exported_timesheet') %}
{% set isForeignEdit = false %}
{% if user != app.user %}
{% set isForeignEdit = true %}
@@ -104,6 +105,7 @@
},
permissions: {
edit: {% if canEdit %}true{% else %}false{% endif %},
edit_exported: {% if canEditExported %}true{% else %}false{% endif %},
create: {% if canCreate %}true{% else %}false{% endif %},
edit_begin: {% if can_edit_begin %}true{% else %}false{% endif %},
edit_end: {% if can_edit_end %}true{% else %}false{% endif %},