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 2020/12/04 14:41:25 UTC
[openmeetings] branch master updated (91994c3 -> 7451ba7)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 91994c3 [OPENMEETINGS-2519] maven-resources-plugin
add 85d587d [OPENMEETINGS-2000] incomplete local user settings dialog
new 69b94c0 Merge branch 'OPENMEETINGS-2000-local-settings-dlg'
new 7451ba7 [OPENMEETINGS-2534] RSS widget should be fixed, rare corner case while room loading
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../openmeetings/service/scheduler/AtomReader.java | 3 +-
.../apache/openmeetings/web/common/MainPanel.java | 2 +-
.../openmeetings/web/common/menu/OmMenuItem.java | 14 +++++++--
.../apache/openmeetings/web/room/RoomPanel.html | 20 ++++++++++++
.../apache/openmeetings/web/room/RoomPanel.java | 2 +-
.../openmeetings/web/room/menu/ActionsSubMenu.java | 36 ++++++++++++++++------
.../openmeetings/web/room/menu/PollsSubMenu.java | 8 ++---
.../openmeetings/web/room/menu/RoomMenuPanel.java | 16 +---------
8 files changed, 68 insertions(+), 33 deletions(-)
[openmeetings] 02/02: [OPENMEETINGS-2534] RSS widget should be
fixed, rare corner case while room loading
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 7451ba7ac848ffffb05b8470e24922b3337e2c74
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Dec 4 21:41:11 2020 +0700
[OPENMEETINGS-2534] RSS widget should be fixed, rare corner case while room loading
---
.../java/org/apache/openmeetings/service/scheduler/AtomReader.java | 3 ++-
.../src/main/java/org/apache/openmeetings/web/room/RoomPanel.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
index 580b1ab..366e267 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.service.scheduler;
+import static org.apache.commons.text.StringEscapeUtils.escapeXml11;
import static org.apache.openmeetings.core.rss.LoadAtomRssFeed.getFeedConnection;
import java.io.IOException;
@@ -113,7 +114,7 @@ public class AtomReader {
}
}
} else if (f != null && evt.isCharacters()) {
- val.append(((Characters)evt).getData());
+ val.append(escapeXml11(((Characters)evt).getData()));
} else if (f != null && evt.isEndElement() && f.getName().equals(((EndElement)evt).getName().getLocalPart())) {
if (!obj.has(f.getAlias())) {
obj.put(f.getAlias(), val.toString());
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 f79c1bb..af57e28 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
@@ -227,7 +227,7 @@ public class RoomPanel extends BasePanel {
super.onDownloadCompleted(target);
try {
Files.deleteIfExists(Paths.get(System.getProperty("java.io.tmpdir"), fuid));
- } catch (IOException e) {
+ } catch (Exception e) {
log.error("unexcepted error while clean-up", e);
}
fuid = null;
[openmeetings] 01/02: Merge branch
'OPENMEETINGS-2000-local-settings-dlg'
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 69b94c09fd47b5b1d340a76fb331092e529b271c
Merge: 91994c3 85d587d
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Dec 3 23:34:11 2020 +0700
Merge branch 'OPENMEETINGS-2000-local-settings-dlg'
.../apache/openmeetings/web/common/MainPanel.java | 2 +-
.../openmeetings/web/common/menu/OmMenuItem.java | 14 +++++++--
.../apache/openmeetings/web/room/RoomPanel.html | 20 ++++++++++++
.../openmeetings/web/room/menu/ActionsSubMenu.java | 36 ++++++++++++++++------
.../openmeetings/web/room/menu/PollsSubMenu.java | 8 ++---
.../openmeetings/web/room/menu/RoomMenuPanel.java | 16 +---------
6 files changed, 65 insertions(+), 31 deletions(-)