You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2016/11/17 03:41:48 UTC
svn commit: r1770106 - in
/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms:
RoomListPanel.java RoomsPanel.java
Author: vdegtyarev
Date: Thu Nov 17 03:41:48 2016
New Revision: 1770106
URL: http://svn.apache.org/viewvc?rev=1770106&view=rev
Log:
Merged OPENMEETINGS-1509 from openmeetings/application/branches/3.2.x:
Users is updated when any user exit from room.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java?rev=1770106&r1=1770105&r2=1770106&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java Thu Nov 17 03:41:48 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.user
import java.util.List;
-import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.UserPanel;
@@ -60,7 +59,7 @@ public class RoomListPanel extends UserP
}
}));
roomContainer.add(new Label("roomName", r.getName()));
- final Label curUsers = new Label("curUsers", new Model<Integer>(Application.getBean(ISessionManager.class).getClientListByRoom(r.getId()).size()));
+ final Label curUsers = new Label("curUsers", new Model<Integer>(Application.getRoomClients(r.getId()).size()));
roomContainer.add(curUsers.setOutputMarkupId(true));
roomContainer.add(new Label("totalUsers", r.getNumberOfPartizipants()));
item.add(new Button("btn").add(new Label("label", label)).add(new RoomEnterBehavior(r.getId()) {
@@ -76,7 +75,7 @@ public class RoomListPanel extends UserP
@Override
public void onClick(AjaxRequestTarget target) {
- target.add(curUsers.setDefaultModelObject(Application.getBean(ISessionManager.class).getClientListByRoom(r.getId()).size()));
+ target.add(curUsers.setDefaultModelObject(Application.getRoomClients(r.getId()).size()));
onRefreshClick(target, r);
}
});
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1770106&r1=1770105&r2=1770106&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java Thu Nov 17 03:41:48 2016
@@ -24,12 +24,11 @@ import java.io.InputStream;
import java.util.List;
import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -109,7 +108,7 @@ public class RoomsPanel extends UserPane
return null;
}
}));
- item.add(new Label("clientLogin", client.getUsername()));
+ item.add(new Label("clientLogin", client.getUser().getLogin()));
item.add(new Label("from", client.getConnectedSince()));
}
};
@@ -117,7 +116,7 @@ public class RoomsPanel extends UserPane
}
void updateRoomDetails(AjaxRequestTarget target) {
- final List<Client> clientsInRoom = Application.getBean(ISessionManager.class).getClientListByRoom(roomId);
+ final List<Client> clientsInRoom = Application.getRoomClients(roomId);
clients.setDefaultModelObject(clientsInRoom);
Room room = Application.getBean(RoomDao.class).get(roomId);
roomID.setObject(room.getId());