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 2016/09/27 01:33:52 UTC
svn commit: r1762390 -
/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Author: solomax
Date: Tue Sep 27 01:33:52 2016
New Revision: 1762390
URL: http://svn.apache.org/viewvc?rev=1762390&view=rev
Log:
[OPENMEETINGS-1478] UserDao is used instead of UserService to get user info
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1762390&r1=1762389&r2=1762390&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Tue Sep 27 01:33:52 2016
@@ -27,9 +27,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.openmeetings.core.remote.UserService;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.user.IUserService;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.AdminPanel;
@@ -152,7 +152,7 @@ public class ConnectionsPanel extends Ad
protected void populateItem(final Item<org.apache.openmeetings.web.app.Client> item) {
org.apache.openmeetings.web.app.Client c = item.getModelObject();
item.add(new Label("id", ""));
- User u = getBean(UserService.class).getUserById(getSid(), c.getUserId());
+ User u = getBean(UserDao.class).get(c.getUserId());
item.add(new Label("login", u == null ? null : u.getLogin()));
item.add(new Label("since", c.getConnectedSince()));
item.add(new Label("scope", "html5"));