From cdf5a545ebc916ffe1b26e322b101474010b7c14 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Tue, 14 Jun 2022 13:07:57 +0200 Subject: [PATCH] fix calendar drag and drop for regular user (#3358) --- src/Constants.php | 4 ++-- templates/calendar/user.html.twig | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Constants.php b/src/Constants.php index b03740e8..06d50fa5 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -17,11 +17,11 @@ class Constants /** * The current release version */ - public const VERSION = '1.20.3'; + public const VERSION = '1.20.4'; /** * 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" */ diff --git a/templates/calendar/user.html.twig b/templates/calendar/user.html.twig index 6ab9bb54..9f484d8c 100644 --- a/templates/calendar/user.html.twig +++ b/templates/calendar/user.html.twig @@ -73,7 +73,9 @@ {% set canDelete = is_granted('delete_own_timesheet') %} {% set canCreate = is_granted('create_own_timesheet') %} {% set canEdit = is_granted('edit_own_timesheet') %} + {% set isForeignEdit = false %} {% if user != app.user %} + {% set isForeignEdit = true %} {% set createParams = '&user=' ~ user.id %} {% set createRoute = 'admin_timesheet_create' %} {% set editRoute = 'admin_timesheet_edit' %} @@ -305,7 +307,9 @@ let source = entry.parentElement; let plainData = entry.dataset.entry; 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 apiUrl = source.dataset.route;