Author: solomax
Date: Sat Feb 25 05:49:07 2017
New Revision: 1784348
URL: http://svn.apache.org/viewvc?rev=1784348&view=rev
Log:
[OPENMEETINGS-1577] dialog button text is escaped
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java?rev=1784348&r1=1784347&r2=1784348&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
Sat Feb 25 05:49:07 2017
@@ -56,12 +56,10 @@ public class OmTreeProvider implements I
public void refreshRoots(boolean all) {
roots.clear();
- if (roomId != null) {
- roots.add(createFileRoot(roomId));
- }
if (all) {
if (roomId != null) {
roots.add(createFileRoot(null));
+ roots.add(createFileRoot(roomId));
}
final String PUBLIC = Application.getString(861);
{
@@ -80,6 +78,10 @@ public class OmTreeProvider implements I
r.setGroupId(g.getId());
roots.add(r);
}
+ } else {
+ if (roomId != null) {
+ roots.add(createFileRoot(roomId));
+ }
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java?rev=1784348&r1=1784347&r2=1784348&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
Sat Feb 25 05:49:07 2017
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.room.sidebar;
+import static org.apache.commons.lang3.StringEscapeUtils.escapeEcmaScript;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -82,7 +83,7 @@ public class UploadDialog extends Abstra
this.roomFiles = roomFiles;
this.room = room;
add(form = new Form<>("form"));
- upload = new DialogButton("upload", Application.getString(593),
false) {
+ upload = new DialogButton("upload",
escapeEcmaScript(Application.getString(593)), false) { //FIXME TODO check this
in 8.0-M5
private static final long serialVersionUID = 1L;
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java?rev=1784348&r1=1784347&r2=1784348&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
Sat Feb 25 05:49:07 2017
@@ -56,12 +56,10 @@ public class OmTreeProvider implements I
public void refreshRoots(boolean all) {
roots.clear();
- if (roomId != null) {
- roots.add(createFileRoot(roomId));
- }
if (all) {
if (roomId != null) {
roots.add(createFileRoot(null));
+ roots.add(createFileRoot(roomId));
}
final String PUBLIC = Application.getString(861);
{
@@ -80,6 +78,10 @@ public class OmTreeProvider implements I
r.setGroupId(g.getId());
roots.add(r);
}
+ } else {
+ if (roomId != null) {
+ roots.add(createFileRoot(roomId));
+ }
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java?rev=1784348&r1=1784347&r2=1784348&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
Sat Feb 25 05:49:07 2017
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.room.sidebar;
+import static org.apache.commons.lang3.StringEscapeUtils.escapeEcmaScript;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -82,7 +83,7 @@ public class UploadDialog extends Abstra
this.roomFiles = roomFiles;
this.room = room;
add(form = new Form<>("form"));
- upload = new DialogButton("upload", Application.getString(593),
false) {
+ upload = new DialogButton("upload",
escapeEcmaScript(Application.getString(593)), false) { //FIXME TODO check this
in 8.0-M5
private static final long serialVersionUID = 1L;
@Override
