diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-03-08 23:19:30 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-03-08 23:19:30 +1300 |
| commit | c0d07811425497f10e41519e090f02cfdffb3c9a (patch) | |
| tree | 6531e75e7e3294b3f4fee26e397f13229e89e507 | |
| parent | e2da4f276230e3687e42b11b4d94889fb3889436 (diff) | |
| download | trackermap-server-c0d07811425497f10e41519e090f02cfdffb3c9a.tar.gz trackermap-server-c0d07811425497f10e41519e090f02cfdffb3c9a.tar.bz2 trackermap-server-c0d07811425497f10e41519e090f02cfdffb3c9a.zip | |
Refactor device permissions resource
| -rw-r--r-- | src/org/traccar/api/resource/DevicePermissionResource.java (renamed from src/org/traccar/api/resource/PermissionResource.java) | 6 | ||||
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 4 | ||||
| -rw-r--r-- | web/app/view/UserDevicesController.js | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/org/traccar/api/resource/PermissionResource.java b/src/org/traccar/api/resource/DevicePermissionResource.java index 7cf2b4ed9..f77375cba 100644 --- a/src/org/traccar/api/resource/PermissionResource.java +++ b/src/org/traccar/api/resource/DevicePermissionResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,10 +28,10 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.sql.SQLException; -@Path("permissions") +@Path("permissions/devices") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) -public class PermissionResource extends BaseResource { +public class DevicePermissionResource extends BaseResource { @POST public Response add(DevicePermission entity) throws SQLException { diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index d6cd19d87..ed006f8cb 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -42,7 +42,7 @@ import org.traccar.api.ResourceErrorHandler; import org.traccar.api.SecurityRequestFilter; import org.traccar.api.resource.CommandResource; import org.traccar.api.resource.DeviceResource; -import org.traccar.api.resource.PermissionResource; +import org.traccar.api.resource.DevicePermissionResource; import org.traccar.api.resource.PositionResource; import org.traccar.api.resource.ServerResource; import org.traccar.api.resource.SessionResource; @@ -140,7 +140,7 @@ public class WebServer { resourceConfig.register(SecurityRequestFilter.class); resourceConfig.register(CorsResponseFilter.class); resourceConfig.registerClasses(ServerResource.class, SessionResource.class, CommandResource.class, - PermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class); + DevicePermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class); servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*"); handlers.addHandler(servletHandler); diff --git a/web/app/view/UserDevicesController.js b/web/app/view/UserDevicesController.js index 4f013fd64..e5dbbdbb8 100644 --- a/web/app/view/UserDevicesController.js +++ b/web/app/view/UserDevicesController.js @@ -47,7 +47,7 @@ Ext.define('Traccar.view.UserDevicesController', { onBeforeSelect: function (object, record, index) { Ext.Ajax.request({ scope: this, - url: '/api/permissions', + url: '/api/permissions/devices', jsonData: { userId: this.userId, deviceId: record.getData().id @@ -64,7 +64,7 @@ Ext.define('Traccar.view.UserDevicesController', { Ext.Ajax.request({ scope: this, method: 'DELETE', - url: '/api/permissions', + url: '/api/permissions/devices', jsonData: { userId: this.userId, deviceId: record.getData().id |