[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15308] booking: tweak check for collisions
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15308] booking: tweak check for collisions |
Date: |
Tue, 21 Jun 2016 10:41:57 +0000 (UTC) |
Revision: 15308
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15308
Author: sigurdne
Date: 2016-06-21 10:41:57 +0000 (Tue, 21 Jun 2016)
Log Message:
-----------
booking: tweak check for collisions
Modified Paths:
--------------
trunk/booking/inc/class.soapplication.inc.php
Modified: trunk/booking/inc/class.soapplication.inc.php
===================================================================
--- trunk/booking/inc/class.soapplication.inc.php 2016-06-21 08:23:09 UTC
(rev 15307)
+++ trunk/booking/inc/class.soapplication.inc.php 2016-06-21 10:41:57 UTC
(rev 15308)
@@ -304,7 +304,7 @@
WHERE ba.id = bar.allocation_id
AND bar.resource_id in ($rids)
AND ((ba.from_ < '$from_' AND ba.to_ > '$from_')
- OR (ba.from_ >= '$from_' AND ba.to_ <= '$to_')
+ OR (ba.from_ > '$from_' AND ba.to_ < '$to_')
OR (ba.from_ < '$to_' AND ba.to_ > '$to_'))
UNION
SELECT be.id
@@ -313,7 +313,7 @@
AND be.id = bed.event_id
AND ber.resource_id in ($rids)
AND ((bed.from_ < '$from_' AND bed.to_ > '$from_')
- OR (bed.from_ >= '$from_' AND bed.to_ <= '$to_')
+ OR (bed.from_ > '$from_' AND bed.to_ < '$to_')
OR (bed.from_ < '$to_' AND bed.to_ > '$to_'))";
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15308] booking: tweak check for collisions,
sigurdne <=