Author: solomax
Date: Fri Oct 19 13:18:35 2012
New Revision: 1400087
URL: http://svn.apache.org/viewvc?rev=1400087&view=rev
Log:
Wicket: DAO method is corrected to filter out appointments
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java?rev=1400087&r1=1400086&r2=1400087&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
Fri Oct 19 13:18:35 2012
@@ -87,7 +87,7 @@ public class RoomDAO implements OmDAO<Ro
TypedQuery<Rooms> q = em.createQuery(
"SELECT DISTINCT c.room FROM Rooms_Organisation
c LEFT JOIN FETCH c.room LEFT JOIN FETCH c.room.currentusers "
+ "WHERE c.organisation.organisation_id =
:orgId "
- + "AND c.deleted = false AND c.room.deleted =
false "
+ + "AND c.deleted = false AND c.room.deleted =
false AND c.room.appointment = false "
+ "AND c.organisation.deleted = false "
+ "ORDER BY c.room.name ASC", Rooms.class);
q.setParameter("orgId", orgId);
