Author: solomax
Date: Tue Mar 14 03:44:32 2017
New Revision: 1786837
URL: http://svn.apache.org/viewvc?rev=1786837&view=rev
Log:
[OPENMEETINGS-980] wicket-jquery-ui version is updated
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
openmeetings/application/trunk/pom.xml
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=1786837&r1=1786836&r2=1786837&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
Tue Mar 14 03:44:32 2017
@@ -18,7 +18,6 @@
*/
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;
@@ -83,7 +82,7 @@ public class UploadDialog extends Abstra
this.roomFiles = roomFiles;
this.room = room;
add(form = new Form<>("form"));
- upload = new DialogButton("upload",
escapeEcmaScript(Application.getString(593)), false) { //FIXME TODO check this
in 8.0-M5
+ upload = new DialogButton("upload", Application.getString(593),
false) {
private static final long serialVersionUID = 1L;
@Override
@@ -192,6 +191,7 @@ public class UploadDialog extends Abstra
} else {
f.setRoomId(parent.getRoomId());
f.setOwnerId(parent.getOwnerId());
+ f.setGroupId(parent.getGroupId());
if (parent.getId() != null) {
f.setParentId(FileItem.Type.Folder == parent.getType() ? parent.getId() :
parent.getParentId());
}
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1786837&r1=1786836&r2=1786837&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Tue Mar 14 03:44:32 2017
@@ -41,7 +41,7 @@
<maven.surefire.version>2.19.1</maven.surefire.version>
<maven-site.version>3.3</maven-site.version>
<wicket.version>8.0.0-M4</wicket.version>
- <wicketju.version>8.0.0-M4</wicketju.version>
+ <wicketju.version>8.0.0-M4.1</wicketju.version>
<wickets.version>8.0.0-M4</wickets.version>
<red5-server.version>1.0.9-M2</red5-server.version>
<red5-client.version>1.0.9-M2</red5-client.version>
