diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-04-16 09:41:22 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 09:41:22 +1200 |
| commit | e4d7d815fe0d05aa7753c2752a99fa4c7cc7a326 (patch) | |
| tree | 772381d37eb1d2e69c2052eb9695aeffc5eefa3c /src/org/traccar/database/NotificationManager.java | |
| parent | 994efc29d550e3f4a69f65ee60aa51816f352d45 (diff) | |
| parent | 30ae3d104e9b0446364ebc316dc10d0f811e1480 (diff) | |
| download | traccar-server-e4d7d815fe0d05aa7753c2752a99fa4c7cc7a326.tar.gz traccar-server-e4d7d815fe0d05aa7753c2752a99fa4c7cc7a326.tar.bz2 traccar-server-e4d7d815fe0d05aa7753c2752a99fa4c7cc7a326.zip | |
Merge pull request #3842 from Abyss777/multi_maintenance
Add support of multiple Maintenances
Diffstat (limited to 'src/org/traccar/database/NotificationManager.java')
| -rw-r--r-- | src/org/traccar/database/NotificationManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java index 1c59a8666..3bc048356 100644 --- a/src/org/traccar/database/NotificationManager.java +++ b/src/org/traccar/database/NotificationManager.java @@ -78,8 +78,10 @@ public class NotificationManager extends ExtendedObjectManager<Notification> { usersToForward = new HashSet<>(); } for (long userId : users) { - if (event.getGeofenceId() == 0 || Context.getGeofenceManager() != null - && Context.getGeofenceManager().checkItemPermission(userId, event.getGeofenceId())) { + if ((event.getGeofenceId() == 0 + || Context.getGeofenceManager().checkItemPermission(userId, event.getGeofenceId())) + && (event.getMaintenanceId() == 0 + || Context.getMaintenancesManager().checkItemPermission(userId, event.getMaintenanceId()))) { if (usersToForward != null) { usersToForward.add(userId); } |