openmeetings git commit: no jira: minor fix on room enter by hash

[solomax]

Repository: openmeetings
Updated Branches:
  refs/heads/master c6646f189 -> 0555aea1c


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/0555aea1
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0555aea1
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0555aea1

Branch: refs/heads/master
Commit: 0555aea1c37782fb3a8f299d3f9b34329f82a056
Parents: c6646f1
Author: Maxim Solodovnik 
Authored: Thu Aug 10 15:24:50 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 15:25:09 2017 +0700

--
 .../src/main/java/org/apache/openmeetings/web/pages/HashPage.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0555aea1/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 eba4438..188bfa2 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
@@ -77,11 +77,11 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
}
 
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()) {
+   error = false;
rp = new RoomPanel(CHILD_ID, room);
mp = new MainPanel(PANEL_MAIN, rp);
replace(mp);

openmeetings git commit: no jira: minor fix on room enter by hash

[solomax]

Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x fc9111d4b -> bfb1959ea


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/bfb1959e
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bfb1959e
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bfb1959e

Branch: refs/heads/3.3.x
Commit: bfb1959ea615cafea274684da00a61b4bf6b3b93
Parents: fc9111d
Author: Maxim Solodovnik 
Authored: Thu Aug 10 15:24:50 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 15:24:50 2017 +0700

--
 .../src/main/java/org/apache/openmeetings/web/pages/HashPage.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfb1959e/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 22e2aa6..0102415 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
@@ -73,11 +73,11 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
}
 
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()) {
+   error = false;
rp = new RoomPanel(CHILD_ID, room);
mp = new MainPanel(PANEL_MAIN, rp);
replace(mp);

openmeetings git commit: no jira: minor fix on room enter by hash

[solomax]

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 
Authored: Thu Aug 10 15:08:25 2017 +0700
Committer: Maxim Solodovnik 
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) {

openmeetings git commit: no jira: minor fix on room enter by hash

[solomax]

Repository: openmeetings
Updated Branches:
  refs/heads/master ea524d3af -> c6646f189


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/c6646f18
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c6646f18
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c6646f18

Branch: refs/heads/master
Commit: c6646f1893b27c1f0ae0ad684a3d068b0e6dfb60
Parents: ea524d3
Author: Maxim Solodovnik 
Authored: Thu Aug 10 15:08:25 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 15:08:25 2017 +0700

--
 .../main/java/org/apache/openmeetings/web/pages/HashPage.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c6646f18/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 8e4f8c6..eba4438 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
@@ -81,7 +81,7 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
getHeader().setVisible(false);
// need to re-fetch Room object to initialize all collections
Room room = getBean(RoomDao.class).get(roomId);
-   if (room != null) {
+   if (room != null && !room.isDeleted()) {
rp = new RoomPanel(CHILD_ID, room);
mp = new MainPanel(PANEL_MAIN, rp);
replace(mp);
@@ -118,7 +118,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);