Author: solomax
Date: Fri Jan 20 00:53:23 2017
New Revision: 1779548
URL: http://svn.apache.org/viewvc?rev=1779548&view=rev
Log:
[OPENMEETINGS-1527] folder drop to WB is denied
Modified:
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.java
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=1779548&r1=1779547&r2=1779548&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
Fri Jan 20 00:53:23 2017
@@ -628,7 +628,7 @@ public class RoomPanel extends BasePanel
}
public void sendFileToWb(FileItem fi, boolean clean) {
- if (activeWbId > -1) {
+ if (activeWbId > -1 && fi.getId() != null &&
FileItem.Type.Folder != fi.getType()) {
if (fi.getType() == FileItem.Type.WmlFile) {
getBean(ConferenceLibrary.class).sendToWhiteboard(getClient().getUid(),
activeWbId, fi);
} else {
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=1779548&r1=1779547&r2=1779548&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
Fri Jan 20 00:53:23 2017
@@ -630,7 +630,7 @@ public class RoomPanel extends BasePanel
}
public void sendFileToWb(FileItem fi, boolean clean) {
- if (activeWbId > -1) {
+ if (activeWbId > -1 && fi.getId() != null &&
FileItem.Type.Folder != fi.getType()) {
if (fi.getType() == FileItem.Type.WmlFile) {
getBean(ConferenceLibrary.class).sendToWhiteboard(getClient().getUid(),
activeWbId, fi);
} else {
