Repository: openmeetings Updated Branches: refs/heads/3.3.x 6540aea60 -> fc1e12385
[OPENMEETINGS-1712] exit button is enabled for external users (disabled for contacts) Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fc1e1238 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fc1e1238 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fc1e1238 Branch: refs/heads/3.3.x Commit: fc1e123854831dc8bef3be7134a002e1d98c704c Parents: 6540aea Author: Maxim Solodovnik <[email protected]> Authored: Wed Sep 27 10:43:58 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 17:51:18 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc1e1238/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 e10854e..b3c43dc 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 @@ -279,8 +279,8 @@ public class RoomMenuPanel extends Panel { PollDao pollDao = getBean(PollDao.class); boolean pollExists = pollDao.hasPoll(r.getId()); User u = room.getClient().getUser(); - boolean notExternalUser = u.getType() != User.Type.external && u.getType() != User.Type.contact; - exitMenuItem.setEnabled(notExternalUser);//TODO check this + boolean notExternalUser = u.getType() != User.Type.contact; + exitMenuItem.setEnabled(notExternalUser); filesMenu.setEnabled(room.getSidebar().isShowFiles()); boolean moder = room.getClient().hasRight(Room.Right.moderator); actionsMenu.setEnabled((moder &&!r.isHidden(RoomElement.ActionMenu)) || (!moder && r.isAllowUserQuestions()));
