Skip to content
Snippets Groups Projects
Commit 46d48fc8 authored by Moritz Strohm's avatar Moritz Strohm
Browse files

do not remove bookings that have the same start/end point as an overwriting lock booking, fixes #6

parent 924a2fac
No related branches found
No related tags found
No related merge requests found
...@@ -733,6 +733,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen ...@@ -733,6 +733,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$delete_sql = '(begin BETWEEN :begin AND :end $delete_sql = '(begin BETWEEN :begin AND :end
OR OR
end BETWEEN :begin AND :end) end BETWEEN :begin AND :end)
AND NOT ((begin = :end) OR (end = :begin))
AND AND
resource_id = :resource_id '; resource_id = :resource_id ';
$sql_params = [ $sql_params = [
...@@ -769,6 +770,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen ...@@ -769,6 +770,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$delete_sql = '(begin BETWEEN :begin AND :end $delete_sql = '(begin BETWEEN :begin AND :end
OR OR
end BETWEEN :begin AND :end) end BETWEEN :begin AND :end)
AND NOT ((begin = :end) OR (end = :begin))
AND AND
resource_id = :resource_id '; resource_id = :resource_id ';
$sql_params = [ $sql_params = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment