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/09/14 06:44:39 UTC
openmeetings git commit: [OPENMEETINGS-1671] minor fixes
Repository: openmeetings
Updated Branches:
refs/heads/OPENMEETINGS-1671-room-files d09f559db -> c17eb7c40
[OPENMEETINGS-1671] minor fixes
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c17eb7c4
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c17eb7c4
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c17eb7c4
Branch: refs/heads/OPENMEETINGS-1671-room-files
Commit: c17eb7c402dfed144815fc9336893d52c478edf2
Parents: d09f559
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Sep 14 13:44:32 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Sep 14 13:44:32 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/db/dao/file/FileItemDao.java | 4 ++--
.../org/apache/openmeetings/db/entity/file/BaseFileItem.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c17eb7c4/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
index fc7f1c3..f8010f3 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
@@ -290,7 +290,7 @@ public class FileItemDao {
return em.createNamedQuery("getAllFileItemsForRoom", BaseFileItem.class)
.setParameter("folder", Type.Folder)
.setParameter("roomId", roomId)
- .setParameter("groups", groups.stream().map(Group::getId).collect(Collectors.toList()))
+ .setParameter("groups", groups.parallelStream().map(Group::getId).collect(Collectors.toList()))
.setParameter("name", String.format("%%%s%%", search == null ? "" : search))
.setFirstResult(start)
.setMaxResults(count)
@@ -299,7 +299,7 @@ public class FileItemDao {
public List<BaseFileItem> get(Collection<String> ids) {
return em.createNamedQuery("getFileItemsByIds", BaseFileItem.class)
- .setParameter("ids", ids.stream().map(Long::valueOf).collect(Collectors.toList()))
+ .setParameter("ids", ids.parallelStream().map(Long::valueOf).collect(Collectors.toList()))
.getResultList();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c17eb7c4/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
index 763e636..c83869d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
@@ -54,7 +54,7 @@ import org.simpleframework.xml.Element;
+ " WHERE f.deleted = false AND f.type <> :folder"
+ " AND (f.roomId IS NULL OR f.roomId = :roomId)"
+ " AND (f.groupId IS NULL OR f.groupId IN :groups)"
- //+ " AND (f.ownerId IS NULL OR f.ownerId = :ownerId)"
+ + " AND f.ownerId IS NULL" // not loading personal files
+ " AND f.name LIKE :name"
+ " ORDER BY f.name")
, @NamedQuery(name = "getFileItemsByIds", query = "SELECT f FROM BaseFileItem f"