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 2017/05/01 06:08:52 UTC
[06/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1603] should
be fixed
[OPENMEETINGS-1603] should be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/dc705d0c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/dc705d0c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/dc705d0c
Branch: refs/heads/3.2.x
Commit: dc705d0cd2e85354235d9558f042da7886ff642e
Parents: 6360e96
Author: Maxim Solodovnik <so...@apache.org>
Authored: Thu Mar 16 03:45:20 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Thu Mar 16 03:45:20 2017 +0000
----------------------------------------------------------------------
.../apache/openmeetings/db/dao/file/FileExplorerItemDao.java | 5 ++++-
.../org/apache/openmeetings/web/common/tree/OmTreeProvider.java | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dc705d0c/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
index f019ce5..91251f6 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
@@ -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)
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dc705d0c/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
index d49598a..e81dd3c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
@@ -147,12 +147,12 @@ public class OmTreeProvider implements ITreeProvider<FileItem> {
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);
}