diff options
| author | Abyss777 <abyss@fox5.ru> | 2017-07-19 15:24:55 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2017-07-19 15:24:55 +0500 |
| commit | a9478ded48de140d47d17def1ee5329267fe6088 (patch) | |
| tree | adc5a9177fd5adcf10a8b56ee4620780dfc13cd9 /src/org/traccar/reports/Events.java | |
| parent | cb0d7cccaecfe049e04defd90884976ac1e982f9 (diff) | |
| download | trackermap-server-a9478ded48de140d47d17def1ee5329267fe6088.tar.gz trackermap-server-a9478ded48de140d47d17def1ee5329267fe6088.tar.bz2 trackermap-server-a9478ded48de140d47d17def1ee5329267fe6088.zip | |
Refactored four managers
Diffstat (limited to 'src/org/traccar/reports/Events.java')
| -rw-r--r-- | src/org/traccar/reports/Events.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java index 0706f1382..3a111944c 100644 --- a/src/org/traccar/reports/Events.java +++ b/src/org/traccar/reports/Events.java @@ -50,7 +50,7 @@ public final class Events { for (Event event : events) { if (all || types.contains(event.getType())) { long geofenceId = event.getGeofenceId(); - if (geofenceId == 0 || Context.getGeofenceManager().checkGeofence(userId, geofenceId)) { + if (geofenceId == 0 || Context.getGeofenceManager().checkItemPermission(userId, geofenceId)) { result.add(event); } } @@ -74,8 +74,8 @@ public final class Events { if (all || types.contains(event.getType())) { long geofenceId = event.getGeofenceId(); if (geofenceId != 0) { - if (Context.getGeofenceManager().checkGeofence(userId, geofenceId)) { - Geofence geofence = Context.getGeofenceManager().getGeofence(geofenceId); + if (Context.getGeofenceManager().checkItemPermission(userId, geofenceId)) { + Geofence geofence = (Geofence) Context.getGeofenceManager().getById(geofenceId); if (geofence != null) { geofenceNames.put(geofenceId, geofence.getName()); } |