[OPENMEETINGS-1620] unenrool seems to be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d5d8633a Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d5d8633a Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d5d8633a Branch: refs/heads/3.2.x Commit: d5d8633a8c2e5dd85ee8a3a27546c8d645459e1b Parents: 7928214 Author: Maxim Solodovnik <[email protected]> Authored: Sun Apr 2 03:39:12 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Apr 2 03:39:12 2017 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/openmeetings/web/room/RoomPanel.java | 2 ++ .../java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d5d8633a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index 1146441..2799991 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -20,6 +20,7 @@ package org.apache.openmeetings.web.room; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.web.app.Application.addUserToRoom; +import static org.apache.openmeetings.web.app.Application.exitRoom; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.Application.getOnlineClient; import static org.apache.openmeetings.web.app.Application.getRoomClients; @@ -426,6 +427,7 @@ public class RoomPanel extends BasePanel { handler.add(room.setVisible(false)); getMainPanel().getChat().toggle(handler, false); clientKicked.open(handler); + exitRoom(getClient()); } } break; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d5d8633a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index 74040e3..86fa8f0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -20,6 +20,7 @@ package org.apache.openmeetings.web.room.menu; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY; +import static org.apache.openmeetings.web.app.Application.exitRoom; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getUserId; import static org.apache.openmeetings.web.util.GroupLogoResourceReference.getUrl; @@ -336,7 +337,7 @@ public class RoomMenuPanel extends Panel { public void exit(IPartialPageRequestHandler handler) { if (WebSession.getRights().contains(User.Right.Dashboard)) { - Application.exitRoom(room.getClient()); + exitRoom(room.getClient()); room.getMainPanel().updateContents(ROOMS_PUBLIC, handler); } else { String url = getBean(ConfigurationDao.class).getConfValue(CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY, String.class, "");
