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 2018/01/26 15:32:23 UTC
[5/5] openmeetings git commit: Map for quick polls is created
Map for quick polls is created
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c9916d59
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c9916d59
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c9916d59
Branch: refs/heads/OPENMEETINGS-1791-quick-poll
Commit: c9916d59b3a1b5fb0872bdd11eab7d1c28283d21
Parents: c3f76bf
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Jan 26 22:32:04 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Jan 26 22:32:04 2018 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/backup/BackupExport.java | 2 +-
.../main/java/org/apache/openmeetings/web/app/Application.java | 5 +++++
.../org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9916d59/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
index 45e09ac..71eca48 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
@@ -526,7 +526,7 @@ public class BackupExport {
root.commit();
}
- private void writeZip(String prefix, URI base, File file, ZipOutputStream zos) throws IOException {
+ private static void writeZip(String prefix, URI base, File file, ZipOutputStream zos) throws IOException {
String path = prefix + "/" + base.relativize(file.toURI()).toString();
log.debug("Writing '" + path + "' to zip file");
ZipEntry zipEntry = new ZipEntry(path);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9916d59/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 9af5134..5d7219e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -154,6 +154,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
private static final String INVALID_SESSIONS_KEY = "INVALID_SESSIONS_KEY";
private static final String ROOMS_KEY = "ROOMS_KEY";
private static final String WBS_KEY = "WBS_KEY";
+ private static final String QUICKPOLL_KEY = "QUICKPOLL_KEY";
private static final String STREAM_CLIENT_KEY = "STREAM_CLIENT_KEY";
public static final String NAME_ATTR_KEY = "name";
//additional maps for faster searching should be created
@@ -364,6 +365,10 @@ public class Application extends AuthenticatedWebApplication implements IApplica
return hazelcast.getMap(WBS_KEY);
}
+ public IMap<Long, Map<Long, Boolean>> getQuickPolls() {
+ return hazelcast.getMap(QUICKPOLL_KEY);
+ }
+
@Override
public Set<Long> getActiveRoomIds() {
return getRooms().keySet();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9916d59/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 655c234..6aab765 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -361,7 +361,7 @@ public class RoomMenuPanel extends Panel {
applyModerMenuItem.setEnabled(!moder);
applyWbMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.whiteBoard));
applyAvMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.audio) || !room.getClient().hasRight(Room.Right.video));
- pollQuickMenuItem.setEnabled(moder);
+ pollQuickMenuItem.setEnabled(room.getClient().hasRight(Room.Right.presenter)); // not started
pollCreateMenuItem.setEnabled(moder);
pollVoteMenuItem.setEnabled(pollExists && notExternalUser && !pollDao.hasVoted(r.getId(), getUserId()));
pollResultMenuItem.setEnabled(pollExists || !pollDao.getArchived(r.getId()).isEmpty());