From 7ebdf9ba53ad91e32f46d108e8b970e56bdc755f Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Mon, 8 Mar 2021 10:23:23 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20Probl=C3=A8me=20au=20niveau=20des?=
 =?UTF-8?q?=20astreintes=20#65?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/schedule-2.0/src/Controller/EventController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php
index d9671c6..1abf52a 100755
--- a/src/schedule-2.0/src/Controller/EventController.php
+++ b/src/schedule-2.0/src/Controller/EventController.php
@@ -492,7 +492,8 @@ class EventController extends AbstractController
     }
 
     public function formatEvent($event) {
-        $editable=(!($event->getValidate())&&!($event->getValidateholiday()));
+        $event instanceof Penalty ? $editable=(!($event->getValidate())) : ($editable=(!($event->getValidate())&&!($event->getValidateholiday())));
+
 
         // Si l'utilisateur en cours est différent de celui de l'event = seul MASTER - ADMIN peuvent modifier
         if($event->getUser()!=$this->getUser()) {
@@ -522,7 +523,7 @@ class EventController extends AbstractController
                 "taskid" => $event->getTask()->getId(),
                 "avatar" => "/".$this->getParameter("appAlias")."/uploads/avatar/".$event->getUser()->getAvatar(),
                 "estimate" => !$event->getTask()->getNature()->getIsvacation() ? $event->getTask()->getDuration($event->getEnd())." / ".$event->getTask()->getQuantity(): "",
-                "locked" => $event->getValidate()||$event->getValidateholiday(),
+                "locked" => ($event instanceof Penalty?$event->getValidate():$event->getValidate()||$event->getValidateholiday()),
                 "editable" => $editable,
                 "astreinte" => ($event instanceof Penalty)
             ]