Author: vdegtyarev
Date: Mon Nov 23 09:30:59 2015
New Revision: 1715744
URL: http://svn.apache.org/viewvc?rev=1715744&view=rev
Log:
Merge revision 1715742 to trunk
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java?rev=1715744&r1=1715743&r2=1715744&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
Mon Nov 23 09:30:59 2015
@@ -38,7 +38,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name="getGroupById", query="SELECT c FROM Group AS c WHERE
c.id = :id AND c.deleted = false")
, @NamedQuery(name="getGroupByName", query="SELECT o FROM Group AS o
WHERE o.name = :name AND o.deleted = false")
, @NamedQuery(name="getAnyGroupById", query="SELECT c FROM Group AS c
WHERE c.id = :groupId")
- , @NamedQuery(name="getGroupByIds", query="SELECT c FROM Group AS c
WHERE c.id IN :ids")
+ , @NamedQuery(name="getGroupsByIds", query="SELECT c FROM Group AS c
WHERE c.id IN :ids")
, @NamedQuery(name="getGroupsByUserId", query="SELECT ou.group FROM
User u, IN(u.groupUsers) ou WHERE u.deleted = false AND u.id = :userId")
, @NamedQuery(name="getNondeletedGroups", query="SELECT o FROM Group o
WHERE o.deleted = false ORDER BY o.id")
, @NamedQuery(name="countGroups", query="SELECT COUNT(c) FROM Group AS
c WHERE c.deleted = false")
