Author: solomax
Date: Thu Mar 16 03:45:20 2017
New Revision: 1787117
URL: http://svn.apache.org/viewvc?rev=1787117&view=rev
Log:
[OPENMEETINGS-1603] should be fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1787117&r1=1787116&r2=1787117&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
Thu Mar 16 03:45:20 2017
@@ -129,7 +129,10 @@ public class FileExplorerItemDao {
}
public List<FileExplorerItem> getByParent(Long parentId, List<Type>
filter) {
- log.debug("getByParent() started");
+ if (filter == null) {
+ return getByParent(parentId);
+ }
+ log.debug("getByParent(filter) started");
return em.createNamedQuery("getFilesFilteredByParent",
FileExplorerItem.class)
.setParameter("filter", filter)
.setParameter("parentId", parentId)
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=1787117&r1=1787116&r2=1787117&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
Thu Mar 16 03:45:20 2017
@@ -147,12 +147,12 @@ public class OmTreeProvider implements I
if (node.getRoomId() != null) {
_list = dao.getByRoom(node.getRoomId());
} else if (node.getGroupId() != null) {
- _list =
dao.getByGroup(node.getGroupId(), roomId == null ? VIDEO_TYPES : null);
+ _list =
dao.getByGroup(node.getGroupId(), /*roomId == null ? VIDEO_TYPES : */null);
} else {
_list =
dao.getByOwner(node.getOwnerId());
}
} else {
- _list = dao.getByParent(id, roomId == null ?
VIDEO_TYPES : null);
+ _list = dao.getByParent(id, /*roomId == null ?
VIDEO_TYPES : */null);
}
list.addAll(_list);
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1787117&r1=1787116&r2=1787117&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
Thu Mar 16 03:45:20 2017
@@ -129,7 +129,10 @@ public class FileExplorerItemDao {
}
public List<FileExplorerItem> getByParent(Long parentId, List<Type>
filter) {
- log.debug("getByParent() started");
+ if (filter == null) {
+ return getByParent(parentId);
+ }
+ log.debug("getByParent(filter) started");
return em.createNamedQuery("getFilesFilteredByParent",
FileExplorerItem.class)
.setParameter("filter", filter)
.setParameter("parentId", parentId)
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=1787117&r1=1787116&r2=1787117&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
Thu Mar 16 03:45:20 2017
@@ -147,12 +147,12 @@ public class OmTreeProvider implements I
if (node.getRoomId() != null) {
_list = dao.getByRoom(node.getRoomId());
} else if (node.getGroupId() != null) {
- _list =
dao.getByGroup(node.getGroupId(), roomId == null ? VIDEO_TYPES : null);
+ _list =
dao.getByGroup(node.getGroupId(), /*roomId == null ? VIDEO_TYPES : */null);
} else {
_list =
dao.getByOwner(node.getOwnerId());
}
} else {
- _list = dao.getByParent(id, roomId == null ?
VIDEO_TYPES : null);
+ _list = dao.getByParent(id, /*roomId == null ?
VIDEO_TYPES : */null);
}
list.addAll(_list);
}
