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/03/08 15:04:23 UTC
svn commit: r1785980 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
Author: solomax
Date: Wed Mar 8 15:04:23 2017
New Revision: 1785980
URL: http://svn.apache.org/viewvc?rev=1785980&view=rev
Log:
[OPENMEETINGS-1547] wait for moderator dialog added
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1785980&r1=1785979&r2=1785980&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Wed Mar 8 15:04:23 2017
@@ -37,6 +37,7 @@
<div wicket:id="nickname"></div>
<div wicket:id="client-kicked"></div>
<div wicket:id="wait-for-moderator"></div>
+ <div wicket:id="wait-apply-moderation"></div>
</div>
<div id="disconnected-dlg" wicket:message="title:204, data-reload:753" style="display:none">
<wicket:message key="556"/>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1785980&r1=1785979&r2=1785980&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Wed Mar 8 15:04:23 2017
@@ -123,6 +123,12 @@ public class RoomPanel extends BasePanel
if (r.isFilesOpened()) {
sidebar.setFilesActive(target);
}
+ if (Room.Type.restricted != r.getType()) {
+ List<Client> mods = Application.getRoomClients(r.getId(), c -> c.hasRight(Room.Right.moderator));
+ if (mods.isEmpty()) {
+ waitApplyModeration.open(target);
+ }
+ }
}
};
private final AbstractDefaultAjaxBehavior activeWb = new AbstractDefaultAjaxBehavior() {
@@ -137,8 +143,8 @@ public class RoomPanel extends BasePanel
}
};
private RedirectMessageDialog roomClosed;
- private MessageDialog clientKicked;
- private MessageDialog waitForModerator;
+ private MessageDialog clientKicked, waitForModerator, waitApplyModeration;
+
private RoomMenuPanel menu;
private RoomSidebar sidebar;
private ActivitiesPanel activities;
@@ -263,7 +269,15 @@ public class RoomPanel extends BasePanel
// no-op
}
};
- add(room, accessDenied, eventDetail, waitForModerator);
+ waitApplyModeration = new MessageDialog("wait-apply-moderation", getString("204"), getString(r.isModerated() ? "641" : "498"), DialogButtons.OK, DialogIcon.LIGHT) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
+ // no-op
+ }
+ };
+ add(room, accessDenied, eventDetail, waitForModerator, waitApplyModeration);
if (r.isWaitForRecording()) {
add(new MessageDialog("wait-for-recording", getString("1316"), getString("1315"), DialogButtons.OK, DialogIcon.LIGHT) {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1785980&r1=1785979&r2=1785980&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Wed Mar 8 15:04:23 2017
@@ -37,6 +37,7 @@
<div wicket:id="nickname"></div>
<div wicket:id="client-kicked"></div>
<div wicket:id="wait-for-moderator"></div>
+ <div wicket:id="wait-apply-moderation"></div>
</div>
<div id="disconnected-dlg" wicket:message="title:204, data-reload:753" style="display:none">
<wicket:message key="556"/>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1785980&r1=1785979&r2=1785980&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Wed Mar 8 15:04:23 2017
@@ -144,11 +144,17 @@ public class RoomPanel extends BasePanel
if (r.isFilesOpened()) {
sidebar.setFilesActive(target);
}
+ if (Room.Type.restricted != r.getType()) {
+ List<Client> mods = Application.getRoomClients(r.getId(), c -> c.hasRight(Room.Right.moderator));
+ if (mods.isEmpty()) {
+ waitApplyModeration.open(target);
+ }
+ }
}
};
private RedirectMessageDialog roomClosed;
- private MessageDialog clientKicked;
- private MessageDialog waitForModerator;
+ private MessageDialog clientKicked, waitForModerator, waitApplyModeration;
+
private RoomMenuPanel menu;
private RoomSidebar sidebar;
private ActivitiesPanel activities;
@@ -275,7 +281,15 @@ public class RoomPanel extends BasePanel
// no-op
}
};
- add(room, accessDenied, eventDetail, waitForModerator);
+ waitApplyModeration = new MessageDialog("wait-apply-moderation", getString("204"), getString(r.isModerated() ? "641" : "498"), DialogButtons.OK, DialogIcon.LIGHT) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
+ // no-op
+ }
+ };
+ add(room, accessDenied, eventDetail, waitForModerator, waitApplyModeration);
if (r.isWaitForRecording()) {
add(new MessageDialog("wait-for-recording", getString("1316"), getString("1315"), DialogButtons.OK, DialogIcon.LIGHT) {
private static final long serialVersionUID = 1L;