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 2014/06/18 12:11:19 UTC
svn commit: r1603389 - in /openmeetings:
branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/
branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/
trunk/singlewebapp/o...
Author: solomax
Date: Wed Jun 18 10:11:19 2014
New Revision: 1603389
URL: http://svn.apache.org/r1603389
Log:
[OPENMEETINGS-1024] add user works as expected with postgres
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java?rev=1603389&r1=1603388&r2=1603389&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java Wed Jun 18 10:11:19 2014
@@ -46,7 +46,7 @@ public class RoomModeratorsDao {
return null;
}
- public List<RoomModerator> get(Collection<String> ids) {
+ public List<RoomModerator> get(Collection<Long> ids) {
return em.createNamedQuery("getRoomModeratorsByIds", RoomModerator.class).setParameter("ids", ids).getResultList();
}
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1603389&r1=1603388&r2=1603389&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java Wed Jun 18 10:11:19 2014
@@ -295,7 +295,7 @@ public class UserDao implements IDataPro
return null;
}
- public List<User> get(Collection<String> ids) {
+ public List<User> get(Collection<Long> ids) {
return em.createNamedQuery("getUsersByIds", User.class).setParameter("ids", ids).getResultList();
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java?rev=1603389&r1=1603388&r2=1603389&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java Wed Jun 18 10:11:19 2014
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.we
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
@@ -45,7 +46,11 @@ public abstract class AdminUserChoicePro
}
@Override
- public Collection<User> toChoices(Collection<String> ids) {
+ public Collection<User> toChoices(Collection<String> _ids) {
+ List<Long> ids = new ArrayList<Long>();
+ for (String id : _ids) {
+ ids.add(Long.valueOf(id));
+ }
return new ArrayList<User>(getBean(UserDao.class).get(ids));
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java?rev=1603389&r1=1603388&r2=1603389&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java Wed Jun 18 10:11:19 2014
@@ -46,7 +46,7 @@ public class RoomModeratorsDao {
return null;
}
- public List<RoomModerator> get(Collection<String> ids) {
+ public List<RoomModerator> get(Collection<Long> ids) {
return em.createNamedQuery("getRoomModeratorsByIds", RoomModerator.class).setParameter("ids", ids).getResultList();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1603389&r1=1603388&r2=1603389&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Wed Jun 18 10:11:19 2014
@@ -295,7 +295,7 @@ public class UserDao implements IDataPro
return null;
}
- public List<User> get(Collection<String> ids) {
+ public List<User> get(Collection<Long> ids) {
return em.createNamedQuery("getUsersByIds", User.class).setParameter("ids", ids).getResultList();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java?rev=1603389&r1=1603388&r2=1603389&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java Wed Jun 18 10:11:19 2014
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.we
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
@@ -45,7 +46,11 @@ public abstract class AdminUserChoicePro
}
@Override
- public Collection<User> toChoices(Collection<String> ids) {
+ public Collection<User> toChoices(Collection<String> _ids) {
+ List<Long> ids = new ArrayList<Long>();
+ for (String id : _ids) {
+ ids.add(Long.valueOf(id));
+ }
return new ArrayList<User>(getBean(UserDao.class).get(ids));
}
}