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

version 1.16.2 (#2942)

Browse Source 
* bump version
* include calendar week in week chooser
* table names in SQL
* show save flash message
* prevent migration warning
* drop default value to prevent error when server version is not set
* csrf token for duplicate actions
* updated translations
This commit is contained in:
Kevin Papst
2021-11-18 12:33:13 +01:00
committed by GitHub
parent c858edf5c9
commit b28e9c120c
37 changed files with 289 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/form/kimai-theme.html.twig
View File

@@ -158,10 +158,8 @@
<a class="btn btn-default" href="#" onclick="return false;">
<span id="{{ form.vars.id }}_week_number" data-toggle="tooltip" data-placement="top" title="{{ 'stats.workingTimeWeek'|trans({'%week%': week|date_format('W')}) }}">
{{ week|month_name(true) }}
{% if week|date_format('m') != nextWeek|date_format('m') %}
&ndash;
{{ nextWeek|month_name(true) }}
{% endif %}
&ndash;
{{ 'stats.workingTimeWeekShort'|trans({'%week%': week|date_format('W')}) }}
</span>
</a>
<a class="btn btn-default btn-right" href="#" onclick="jQuery('#{{ form.vars.id }}').val('{{ nextWeek|report_date }}').change()" data-toggle="tooltip" data-placement="top" title="{{ 'stats.workingTimeWeek'|trans({'%week%': nextWeek|date_format('W')}) }}">

2
templates/project/actions.html.twig
View File

@@ -6,7 +6,7 @@
{% macro project(project, view, isTable) %}
{% import "macros/widgets.html.twig" as widgets %}
{% set event = actions(app.user, 'project', view, {'project': project}) %}
{% set event = actions(app.user, 'project', view, {'project': project, 'token': csrf_token('project.duplicate')}) %}
{% if view == 'index' or view == 'custom' or isTable is not null %}
{{ widgets.table_actions(event.actions) }}
{% else %}

2
templates/team/actions.html.twig
View File

@@ -6,7 +6,7 @@
{% macro team(team, view) %}
{% import "macros/widgets.html.twig" as widgets %}
{% set event = actions(app.user, 'team', view, {'team': team}) %}
{% set event = actions(app.user, 'team', view, {'team': team, 'token': csrf_token('team.duplicate')}) %}
{% if view == 'index' %}
{{ widgets.table_actions(event.actions) }}
{% else %}

2
templates/timesheet-team/actions.html.twig
View File

@@ -6,7 +6,7 @@
{% macro timesheet_team(timesheet, view) %}
{% import "macros/widgets.html.twig" as widgets %}
{% set event = actions(app.user, 'timesheet_team', view, {'timesheet': timesheet}) %}
{% set event = actions(app.user, 'timesheet_team', view, {'timesheet': timesheet, 'token': csrf_token('admin_timesheet.duplicate')}) %}
{% if view == 'index' or view == 'custom' %}
{{ widgets.table_actions(event.actions) }}
{% else %}

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

@@ -6,7 +6,7 @@
{% macro timesheet(timesheet, view, options) %}
{% import "macros/widgets.html.twig" as widgets %}
{% set event = actions(app.user, 'timesheet', view, {'timesheet': timesheet}) %}
{% set event = actions(app.user, 'timesheet', view, {'timesheet': timesheet, 'token': csrf_token('timesheet.duplicate')}) %}
{% if view == 'index' or view == 'custom' %}
{{ widgets.table_actions(event.actions) }}
{% else %}