aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Strohm <strohm@data-quest.de>2021-07-26 10:21:46 +0200
committerMoritz Strohm <strohm@data-quest.de>2021-07-26 10:21:46 +0200
commit46d48fc81dfa66ee6ea6e61b05fdacde24ffe55f (patch)
tree43fe801a293ba3ff0cfeefffb45a61a6bf3a242f
parent924a2facce2a16dc6668a555f2db3d8c1e14930d (diff)
do not remove bookings that have the same start/end point as an overwriting lock booking, fixes #6
-rw-r--r--lib/models/resources/ResourceBooking.class.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php
index a2e6f15..ad22cef 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 = [