Changeset 5c7119d

Timestamp:

06/24/11 17:39:10 (12 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

8bdf2d3

Parents:

496685d

Message:

Fixed bug reported by gregor: Too many authors are shown (form other conferences as well).

Files:

• BUGS (modified) (2 diffs)
• src/mvc/event.cpp (modified) (2 diffs)

BUGS

@@ -3 +3 @@
 
 -------------------------------------------------------------------
-BugId: 1
+BugID: 1
 Title: Persons are not deleted when deleting a conference.
 Status: Fixed.
 -------------------------------------------------------------------
-BugId: 2
+BugID: 2
 Title: SQL injections possible.
 Status: Fixed.
@@ -21 +21 @@
 Status:
 -------------------------------------------------------------------
+BugID 5
+Title: Too many authors are shown (from other conferences).
+Severity: major
+Status: Fixed.
+-------------------------------------------------------------------

src/mvc/event.cpp

@@ -158 +158 @@
     {
         QSqlQuery query;
-        // TODO: conference ID isn't used here
-        query.prepare("SELECT person.name FROM person INNER JOIN event_person ON person.id = event_person.xid_person AND event_person.xid_event = :id AND event_person.xid_conference = :conf");
+        query.prepare("SELECT person.name FROM person INNER JOIN event_person ON person.id = event_person.xid_person AND event_person.xid_event = :id AND event_person.xid_conference = :conf1 AND person.xid_conference = :conf2");
         query.bindValue(":id", id());
-        query.bindValue(":conf", conferenceId());
-        query.exec();
-        // TODO: handle qeury error
-        //qDebug() << query.lastError();
+        query.bindValue(":conf1", conferenceId());
+        query.bindValue(":conf2", conferenceId());
+        if (!query.exec())  qDebug() << query.lastError();
 
         while(query.next())
@@ -227 +225 @@
     QString strQuery = QString("SELECT %1 FROM EVENT INNER JOIN SEARCH_EVENT USING (xid_conference, id) ").arg(columnsForSelect());
     strQuery += QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy);
-    //qDebug() << strQuery;
+
     QList<Event> list;
     QSqlQuery query;