diff options
| author | Anton Tananaev <anton@traccar.org> | 2024-07-23 07:59:19 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2024-07-23 07:59:19 -0700 |
| commit | 1f1edcfb0e7ca5a6daf2a9a251a433062344d680 (patch) | |
| tree | 21c0cbeb9543cd2a1fc3a6933e40d9afdbb95b31 /src/main | |
| parent | e1be8916132fd0102cfe298a75abcfdcd43f244b (diff) | |
| download | trackermap-server-1f1edcfb0e7ca5a6daf2a9a251a433062344d680.tar.gz trackermap-server-1f1edcfb0e7ca5a6daf2a9a251a433062344d680.tar.bz2 trackermap-server-1f1edcfb0e7ca5a6daf2a9a251a433062344d680.zip | |
Add device users column
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/traccar/api/resource/UserResource.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/api/resource/UserResource.java b/src/main/java/org/traccar/api/resource/UserResource.java index fbc31e46a..65ca2c883 100644 --- a/src/main/java/org/traccar/api/resource/UserResource.java +++ b/src/main/java/org/traccar/api/resource/UserResource.java @@ -25,6 +25,7 @@ import org.traccar.config.Config; import org.traccar.config.Keys; import org.traccar.helper.LogAction; import org.traccar.helper.model.UserUtil; +import org.traccar.model.Device; import org.traccar.model.ManagedUser; import org.traccar.model.Permission; import org.traccar.model.User; @@ -61,12 +62,18 @@ public class UserResource extends BaseObjectResource<User> { } @GET - public Collection<User> get(@QueryParam("userId") long userId) throws StorageException { + public Collection<User> get( + @QueryParam("userId") long userId, @QueryParam("deviceId") long deviceId) throws StorageException { if (userId > 0) { permissionsService.checkUser(getUserId(), userId); return storage.getObjects(baseClass, new Request( new Columns.All(), new Condition.Permission(User.class, userId, ManagedUser.class).excludeGroups())); + } else if (deviceId > 0) { + permissionsService.checkAdmin(getUserId()); + return storage.getObjects(baseClass, new Request( + new Columns.All(), + new Condition.Permission(User.class, Device.class, deviceId).excludeGroups())); } else if (permissionsService.notAdmin(getUserId())) { return storage.getObjects(baseClass, new Request( new Columns.All(), |