aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database/CalendarManager.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/database/CalendarManager.java')
-rw-r--r--src/org/traccar/database/CalendarManager.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/org/traccar/database/CalendarManager.java b/src/org/traccar/database/CalendarManager.java
index 3e95f6698..31d484327 100644
--- a/src/org/traccar/database/CalendarManager.java
+++ b/src/org/traccar/database/CalendarManager.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import org.traccar.Context;
import org.traccar.helper.Log;
import org.traccar.model.Calendar;
import org.traccar.model.CalendarPermission;
@@ -69,6 +70,15 @@ public class CalendarManager {
return result;
}
+ public Collection<Calendar> getManagedCalendars(long userId) {
+ ArrayList<Calendar> result = new ArrayList<>();
+ result.addAll(getUserCalendars(userId));
+ for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
+ result.addAll(getUserCalendars(managedUserId));
+ }
+ return result;
+ }
+
public final void refreshUserCalendars() {
if (dataManager != null) {
try {