[OPENMEETINGS-1671] add id filtering
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/db36ff2e Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/db36ff2e Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/db36ff2e Branch: refs/heads/3.3.x Commit: db36ff2e9e41ac82d846f084ce5364db0f82fc47 Parents: 8bfe1c0 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Thu Sep 14 17:00:53 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Thu Sep 14 17:00:53 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/web/admin/rooms/RoomForm.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db36ff2e/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java index 06cda04..8c9d147 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; import org.apache.openmeetings.db.dao.file.FileItemDao; import org.apache.openmeetings.db.dao.room.RoomDao; @@ -170,16 +171,19 @@ public class RoomForm extends AdminBaseForm<Room> { @Override public void query(String term, int page, Response<RoomGroup> response) { - for (RoomGroup or : orgRooms) { - if (Strings.isEmpty(term) || or.getGroup().getName().contains(term)) { - response.add(or); - } - } + response.addAll(orgRooms.stream() + .filter(rg -> Strings.isEmpty(term) || rg.getGroup().getName().contains(term)) + .collect(Collectors.toList()) + ); } @Override public RoomGroup fromId(String _id) { Long id = Long.valueOf(_id); + + if (!orgList.stream().filter(g -> g.getId().equals(id)).findFirst().isPresent()) { + return null; // seems to be hacked + } Group g = getBean(GroupDao.class).get(id); return new RoomGroup(g, RoomForm.this.getModelObject()); }
