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/20 14:19:54 UTC
openmeetings git commit: [OPENMEETINGS-1703] loader for external room
is fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 118823fe5 -> 3e27864e1
[OPENMEETINGS-1703] loader for external room is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3e27864e
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3e27864e
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3e27864e
Branch: refs/heads/master
Commit: 3e27864e1f9d5637f80a7cce868392379db43fdb
Parents: 118823f
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Sep 20 21:19:46 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Sep 20 21:19:46 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/web/pages/HashPage.java | 1 +
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 4 ++--
.../org/apache/openmeetings/web/user/rooms/RoomListPanel.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e27864e/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 31bff68..c50c08d 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,6 +77,7 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
}
private void createRoom(Long roomId) {
+ getLoader().setVisible(true);
getHeader().setVisible(false);
// need to re-fetch Room object to initialize all collections
Room room = getBean(RoomDao.class).get(roomId);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e27864e/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 3c1647b..e593697 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
@@ -65,7 +65,7 @@ import org.apache.openmeetings.util.message.TextRoomMessage;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
-import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.openmeetings.web.pages.BasePage;
import org.apache.openmeetings.web.room.activities.ActivitiesPanel;
import org.apache.openmeetings.web.room.activities.Activity;
import org.apache.openmeetings.web.room.menu.RoomMenuPanel;
@@ -684,7 +684,7 @@ public class RoomPanel extends BasePanel {
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
getBasePage().getHeader().setVisible(false);
getMainPanel().getTopControls().setVisible(false);
- Component loader = ((MainPage)getPage()).getLoader().setVisible(false);
+ Component loader = ((BasePage)getPage()).getLoader().setVisible(false);
if (r.isHidden(RoomElement.Chat) || !isVisible()) {
getMainPanel().getChat().toggle(handler, false);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e27864e/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
index f1aa056..1cfde98 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.UserPanel;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -32,6 +31,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
@@ -41,7 +41,7 @@ import com.googlecode.wicket.jquery.ui.form.button.Button;
import com.googlecode.wicket.jquery.ui.markup.html.link.AjaxLink;
import com.googlecode.wicket.jquery.ui.widget.tooltip.TooltipBehavior;
-public class RoomListPanel extends UserPanel {
+public class RoomListPanel extends Panel {
private static final long serialVersionUID = 1L;
private final ListView<Room> list;