Repository: openmeetings Updated Branches: refs/heads/3.3.x c5944366d -> fc9111d4b
no jira: minor fix on room enter by hash Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fc9111d4 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fc9111d4 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fc9111d4 Branch: refs/heads/3.3.x Commit: fc9111d4bb7b8e6ad37b03d7b2892e31e42beff6 Parents: c594436 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Thu Aug 10 15:08:25 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Thu Aug 10 15:14:03 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/web/pages/HashPage.java | 38 ++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc9111d4/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java index 7c98592..22e2aa6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java @@ -66,8 +66,27 @@ public class HashPage extends BaseInitedPage implements IUpdatable { private boolean error = true; private MainPanel mp = null; private RoomPanel rp = null; + private final PageParameters p; public HashPage(PageParameters p) { + this.p = p; + } + + private void createRoom(Long roomId) { + error = false; + getHeader().setVisible(false); + // need to re-fetch Room object to initialize all collections + Room room = getBean(RoomDao.class).get(roomId); + if (room != null && !room.isDeleted()) { + rp = new RoomPanel(CHILD_ID, room); + mp = new MainPanel(PANEL_MAIN, rp); + replace(mp); + } + } + + @Override + protected void onInitialize() { + super.onInitialize(); StringValue secure = p.get(HASH); StringValue invitation = p.get(INVITATION_HASH); @@ -95,7 +114,7 @@ public class HashPage extends BaseInitedPage implements IUpdatable { error = false; } Room r = i.getRoom(); - if (r != null) { + if (r != null && !r.isDeleted()) { createRoom(r.getId()); if (i.isPasswordProtected() && rp != null) { mp.getChat().setVisible(false); @@ -124,23 +143,6 @@ public class HashPage extends BaseInitedPage implements IUpdatable { } add(recContainer.add(vi.setShowShare(false).setOutputMarkupPlaceholderTag(true), vp.setOutputMarkupPlaceholderTag(true)), new InvitationPasswordDialog("i-pass", this)); - } - - private void createRoom(Long roomId) { - error = false; - getHeader().setVisible(false); - // need to re-fetch Room object to initialize all collections - Room room = getBean(RoomDao.class).get(roomId); - if (room != null) { - rp = new RoomPanel(CHILD_ID, room); - mp = new MainPanel(PANEL_MAIN, rp); - replace(mp); - } - } - - @Override - protected void onInitialize() { - super.onInitialize(); remove(urlParametersReceivingBehavior); add(new MessageDialog("access-denied", getString("invalid.hash"), getString(errorKey), DialogButtons.OK, DialogIcon.ERROR) {
