You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/09/11 11:34:39 UTC
openmeetings git commit: [OPENMEETINGS-1700] seems to be fixed
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 3a2dd8378 -> d55c0b36b
[OPENMEETINGS-1700] 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/d55c0b36
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d55c0b36
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d55c0b36
Branch: refs/heads/3.3.x
Commit: d55c0b36b5b98bfd8982cfba694916184b4427fb
Parents: 3a2dd83
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Sep 11 18:34:29 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Sep 11 18:34:29 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/web/common/MainPanel.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d55c0b36/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 2c6fec2..2176e16 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -98,7 +98,7 @@ public class MainPanel extends Panel {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(MainPanel.class, webAppRootKey);
private static final String DELIMITER = " ";
- private static final WebMarkupContainer EMPTY = new WebMarkupContainer(CHILD_ID);
+ private final WebMarkupContainer EMPTY = new WebMarkupContainer(CHILD_ID);
public static final String PARAM_USER_ID = "userId";
private String uid = null;
private final MenuPanel menu;
@@ -126,11 +126,12 @@ public class MainPanel extends Panel {
public MainPanel(String id, BasePanel _panel) {
super(id);
this.panel = _panel;
+ setAuto(true);
setOutputMarkupId(true);
add(topControls.setOutputMarkupPlaceholderTag(true).setMarkupId("topControls"));
menu = new MenuPanel("menu", getMainMenu());
contents = new WebMarkupContainer("contents");
- add(contents.add(getClient() == null ? EMPTY : _panel).setOutputMarkupId(true).setMarkupId("contents"));
+ add(contents.add(getClient() == null || _panel == null ? EMPTY : _panel).setOutputMarkupId(true).setMarkupId("contents"));
topControls.add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
topLinks.add(new AjaxLink<Void>("messages") {
private static final long serialVersionUID = 1L;