diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-27 17:00:45 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 17:00:45 +1200 |
| commit | 495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598 (patch) | |
| tree | 4b65fbe2d6081f31762a0d8aa790b9fcf81e81f7 /src/org/traccar/reports/Trips.java | |
| parent | 194263a9dc8040ebcbf62c80733aca5097eb3e36 (diff) | |
| parent | 49fa4893269b1732806f7176c279742291e02edf (diff) | |
| download | trackermap-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/reports/Trips.java')
| -rw-r--r-- | src/org/traccar/reports/Trips.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java index 5c26bea54..68b03a819 100644 --- a/src/org/traccar/reports/Trips.java +++ b/src/org/traccar/reports/Trips.java @@ -73,11 +73,11 @@ public final class Trips { Context.getPermissionsManager().checkDevice(userId, deviceId); Collection<TripReport> trips = detectTrips(deviceId, from, to); DeviceReport deviceTrips = new DeviceReport(); - Device device = Context.getIdentityManager().getDeviceById(deviceId); + Device device = Context.getIdentityManager().getById(deviceId); deviceTrips.setDeviceName(device.getName()); sheetNames.add(WorkbookUtil.createSafeSheetName(deviceTrips.getDeviceName())); if (device.getGroupId() != 0) { - Group group = Context.getDeviceManager().getGroupById(device.getGroupId()); + Group group = Context.getGroupsManager().getById(device.getGroupId()); if (group != null) { deviceTrips.setGroupName(group.getName()); } |