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

fix calendar drag and drop for regular user (#3358)

Browse Source
This commit is contained in:
Kevin Papst
2022-06-14 13:07:57 +02:00
committed by GitHub
parent a60df65062
commit cdf5a545eb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ class Constants
/** /**
* The current release version * The current release version
*/ */
public const VERSION = '1.20.3'; public const VERSION = '1.20.4';
/** /**
* The current release: major * 10000 + minor * 100 + patch * The current release: major * 10000 + minor * 100 + patch
*/ */
public const VERSION_ID = 12003; public const VERSION_ID = 12004;
/** /**
* The current release status, either "stable" or "dev" * The current release status, either "stable" or "dev"
*/ */

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

@@ -73,7 +73,9 @@
{% set canDelete = is_granted('delete_own_timesheet') %} {% set canDelete = is_granted('delete_own_timesheet') %}
{% set canCreate = is_granted('create_own_timesheet') %} {% set canCreate = is_granted('create_own_timesheet') %}
{% set canEdit = is_granted('edit_own_timesheet') %} {% set canEdit = is_granted('edit_own_timesheet') %}
{% set isForeignEdit = false %}
{% if user != app.user %} {% if user != app.user %}
{% set isForeignEdit = true %}
{% set createParams = '&user=' ~ user.id %} {% set createParams = '&user=' ~ user.id %}
{% set createRoute = 'admin_timesheet_create' %} {% set createRoute = 'admin_timesheet_create' %}
{% set editRoute = 'admin_timesheet_edit' %} {% set editRoute = 'admin_timesheet_edit' %}
@@ -305,7 +307,9 @@
let source = entry.parentElement; let source = entry.parentElement;
let plainData = entry.dataset.entry; let plainData = entry.dataset.entry;
let data = JSON.parse(plainData); let data = JSON.parse(plainData);
data.user = {{ user.id }}; {% if isForeignEdit and canCreate %}
data.user = {{ user.id }};
{% endif %}
let urlReplacer = JSON.parse(source.dataset.routeReplacer); let urlReplacer = JSON.parse(source.dataset.routeReplacer);
let apiUrl = source.dataset.route; let apiUrl = source.dataset.route;