You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/20 18:49:08 UTC

svn commit: r1515868 - /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java

Author: solomax
Date: Tue Aug 20 16:49:07 2013
New Revision: 1515868

URL: http://svn.apache.org/r1515868
Log:
[OPENMEETINGS-767] Queries are updated according to the latest changes in MM class

Modified:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1515868&r1=1515867&r2=1515868&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java Tue Aug 20 16:49:07 2013
@@ -60,7 +60,7 @@ import org.simpleframework.xml.Root;
     	)
     , @NamedQuery(name="joinedAppointmentsInRange",
     	query="SELECT a FROM MeetingMember mm, IN(mm.appointment) a "
-			+ "WHERE mm.deleted <> true AND mm.invitor <> true AND mm.userid.user_id = :userId "
+			+ "WHERE mm.deleted <> true AND mm.userid.user_id <> a.userId.user_id AND mm.userid.user_id = :userId "
 			+ "	AND a.appointmentId NOT IN (SELECT a.appointmentId FROM Appointment a WHERE a.userId.user_id = :userId)"
 			+ "	AND mm.isConnectedEvent <> true " //TODO review: isConnectedEvent is set for the MeetingMember if event is created from "Private Messages", it is weird
 			+ "	AND ( "
@@ -73,7 +73,7 @@ import org.simpleframework.xml.Root;
 	//his own user as second meeting-member, swagner 19.02.2012
     , @NamedQuery(name="appointmentsInRangeByUser",
 	query="SELECT a FROM MeetingMember mm, IN(mm.appointment) a "
-		+ "WHERE mm.deleted <> true AND mm.invitor <> true AND mm.userid.user_id = :userId "
+		+ "WHERE mm.deleted <> true AND mm.userid.user_id <> a.userId.user_id AND mm.userid.user_id = :userId "
 		+ "	AND ( "
 		+ "		(a.appointmentStarttime BETWEEN :starttime AND :endtime) "
 		+ "		OR (a.appointmentEndtime BETWEEN :starttime AND :endtime) "
@@ -82,7 +82,7 @@ import org.simpleframework.xml.Root;
     )
     , @NamedQuery(name="appointedRoomsInRangeByUser",
 	query="SELECT a.room FROM MeetingMember mm, IN(mm.appointment) a "
-		+ "WHERE mm.deleted <> true AND mm.invitor <> true AND mm.userid.user_id = :userId "
+		+ "WHERE mm.deleted <> true AND mm.userid.user_id <> a.userId.user_id AND mm.userid.user_id = :userId "
 		+ "	AND ( "
 		+ "		(a.appointmentStarttime BETWEEN :starttime AND :endtime) "
 		+ "		OR (a.appointmentEndtime BETWEEN :starttime AND :endtime) "