aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-12-05 23:33:18 +1300
committerGitHub <noreply@github.com>2016-12-05 23:33:18 +1300
commit40607036c5aa6385a7ae3f3a283bf107238a5944 (patch)
tree72ff1743d96f79e4a9d85b0d48715e5f9aa67cf9 /src/org/traccar/api/resource
parenta9260f9e470add52f1fe3df35ea93e0d547c3fe7 (diff)
parenteffcde41e6f77df3829a9809f48fcc3aed9caade (diff)
downloadtrackermap-server-40607036c5aa6385a7ae3f3a283bf107238a5944.tar.gz
trackermap-server-40607036c5aa6385a7ae3f3a283bf107238a5944.tar.bz2
trackermap-server-40607036c5aa6385a7ae3f3a283bf107238a5944.zip
Merge pull request #2638 from Abyss777/improve_notifications
Use model instead of attributes to store Notification options
Diffstat (limited to 'src/org/traccar/api/resource')
-rw-r--r--src/org/traccar/api/resource/NotificationResource.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/api/resource/NotificationResource.java b/src/org/traccar/api/resource/NotificationResource.java
index 6c9725f37..03f7e4ba0 100644
--- a/src/org/traccar/api/resource/NotificationResource.java
+++ b/src/org/traccar/api/resource/NotificationResource.java
@@ -49,7 +49,7 @@ public class NotificationResource extends BaseResource {
userId = getUserId();
}
Context.getPermissionsManager().checkUser(getUserId(), userId);
- return Context.getNotificationManager().getUserNotifications(userId);
+ return Context.getNotificationManager().getAllUserNotifications(userId);
}
@POST