Changeset 8cb5c4f

Timestamp:

01/28/10 14:02:35 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

02a8af2

Parents:

412cef6

Message:

changed conditions for conflicts

File:

• src/mvc/event.cpp (modified) (1 diff)

src/mvc/event.cpp

@@ -74 +74 @@
     Event event = Event::getById(aEventId,conferenceId);
     query.prepare(selectQuery() + "WHERE xid_conference = :conf AND ( \
-           ( start <= :start1 AND ( start + duration ) >= :start2 ) \
-        OR ( start >= :start3 AND ( start + duration ) <= :end1 ) \
-        OR ( start <= :end2  AND ( start + duration ) >= :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start");
+           ( start < :start1 AND ( start + duration ) > :start2 ) \
+        OR ( start > :start3 AND ( start + duration ) < :end1 ) \
+        OR ( start < :end2  AND ( start + duration ) > :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start");
     query.bindValue(":conf", event.conferenceId());
     query.bindValue(":start1", convertToDb(event.start(), QVariant::DateTime));