diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-17 22:48:33 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-17 22:48:33 +1300 |
| commit | af6c734879aa483efcc8150d5fdb704f40fb59cd (patch) | |
| tree | 3d8e4c832f87954513b1dbd614f7a1f757a4fa99 /src/org/traccar/api/resource/UserResource.java | |
| parent | 512b95fd6975005c6460ddad16714502510cb16e (diff) | |
| download | traccar-server-af6c734879aa483efcc8150d5fdb704f40fb59cd.tar.gz traccar-server-af6c734879aa483efcc8150d5fdb704f40fb59cd.tar.bz2 traccar-server-af6c734879aa483efcc8150d5fdb704f40fb59cd.zip | |
Add user expiration and device limit
Diffstat (limited to 'src/org/traccar/api/resource/UserResource.java')
| -rw-r--r-- | src/org/traccar/api/resource/UserResource.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java index f0a8597cc..c6e84c918 100644 --- a/src/org/traccar/api/resource/UserResource.java +++ b/src/org/traccar/api/resource/UserResource.java @@ -60,13 +60,16 @@ public class UserResource extends BaseResource { @Path("{id}") @PUT public Response update(@PathParam("id") long id, User entity) throws SQLException { - if (entity.getAdmin()) { + User old = Context.getPermissionsManager().getUser(entity.getId()); + if (old.getExpirationTime() == null && entity.getExpirationTime() != null + || old.getExpirationTime() != null && !old.getExpirationTime().equals(entity.getExpirationTime()) + || old.getAdmin() != entity.getAdmin() + || old.getReadonly() != entity.getReadonly() + || old.getDisabled() != entity.getDisabled() + || old.getDeviceLimit() != entity.getDeviceLimit()) { Context.getPermissionsManager().checkAdmin(getUserId()); } else { Context.getPermissionsManager().checkUser(getUserId(), entity.getId()); - if (!entity.getReadonly()) { - Context.getPermissionsManager().checkReadonly(entity.getId()); - } } Context.getPermissionsManager().updateUser(entity); if (Context.getNotificationManager() != null) { |