diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-18 19:12:25 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 19:12:25 +1300 |
| commit | 3eca9acd6e6a160df8f7b86150429c3d7c09b0c3 (patch) | |
| tree | cb8bc7293a5c3fbac7f5e7557c73baded57109d8 /src/org/traccar/api/resource/UserResource.java | |
| parent | f04881e56938315867a97db2027d58f27f7a20fd (diff) | |
| parent | f35da3ffdf6f960a877149b72b819a1979c9395a (diff) | |
| download | trackermap-server-3eca9acd6e6a160df8f7b86150429c3d7c09b0c3.tar.gz trackermap-server-3eca9acd6e6a160df8f7b86150429c3d7c09b0c3.tar.bz2 trackermap-server-3eca9acd6e6a160df8f7b86150429c3d7c09b0c3.zip | |
Merge pull request #2548 from tananaev/users
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) { |