From 46d48fc81dfa66ee6ea6e61b05fdacde24ffe55f Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 26 Jul 2021 10:21:46 +0200
Subject: [PATCH] do not remove bookings that have the same start/end point as
an overwriting lock booking, fixes #6
---
lib/models/resources/ResourceBooking.class.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php
index a2e6f1504d9..ad22cef2503 100644
--- a/lib/models/resources/ResourceBooking.class.php
+++ b/lib/models/resources/ResourceBooking.class.php
@@ -733,6 +733,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$delete_sql = '(begin BETWEEN :begin AND :end
OR
end BETWEEN :begin AND :end)
+ AND NOT ((begin = :end) OR (end = :begin))
AND
resource_id = :resource_id ';
$sql_params = [
@@ -769,6 +770,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$delete_sql = '(begin BETWEEN :begin AND :end
OR
end BETWEEN :begin AND :end)
+ AND NOT ((begin = :end) OR (end = :begin))
AND
resource_id = :resource_id ';
$sql_params = [
--
GitLab