aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource/CalendarResource.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-07-27 17:00:45 +1200
committerGitHub <noreply@github.com>2017-07-27 17:00:45 +1200
commit495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598 (patch)
tree4b65fbe2d6081f31762a0d8aa790b9fcf81e81f7 /src/org/traccar/api/resource/CalendarResource.java
parent194263a9dc8040ebcbf62c80733aca5097eb3e36 (diff)
parent49fa4893269b1732806f7176c279742291e02edf (diff)
downloadtrackermap-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.gz
trackermap-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.bz2
trackermap-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.zip
Merge pull request #3391 from Abyss777/refactor_drivers_groups
Split Drivers and Groups management
Diffstat (limited to 'src/org/traccar/api/resource/CalendarResource.java')
-rw-r--r--src/org/traccar/api/resource/CalendarResource.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/org/traccar/api/resource/CalendarResource.java b/src/org/traccar/api/resource/CalendarResource.java
index a0f8656af..f8d78a847 100644
--- a/src/org/traccar/api/resource/CalendarResource.java
+++ b/src/org/traccar/api/resource/CalendarResource.java
@@ -18,6 +18,7 @@ package org.traccar.api.resource;
import java.sql.SQLException;
import java.util.Collection;
+import java.util.Set;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -47,20 +48,22 @@ public class CalendarResource extends BaseResource {
@QueryParam("all") boolean all, @QueryParam("userId") long userId) throws SQLException {
CalendarManager calendarManager = Context.getCalendarManager();
+ Set<Long> result = null;
if (all) {
if (Context.getPermissionsManager().isAdmin(getUserId())) {
- return calendarManager.getItems(Calendar.class, calendarManager.getAllItems());
+ result = calendarManager.getAllItems();
} else {
Context.getPermissionsManager().checkManager(getUserId());
- return calendarManager.getItems(Calendar.class, calendarManager.getManagedItems(getUserId()));
+ result = calendarManager.getManagedItems(getUserId());
}
} else {
if (userId == 0) {
userId = getUserId();
}
Context.getPermissionsManager().checkUser(getUserId(), userId);
- return calendarManager.getItems(Calendar.class, calendarManager.getUserItems(userId));
+ result = calendarManager.getUserItems(userId);
}
+ return calendarManager.getItems(result);
}
@POST