From c8816bdd85d62fb767795b2dc4d31326fdad9cd5 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 22 Sep 2016 10:44:29 +0500 Subject: - rename table and unique constraint - rename some functions - optimization and simplification --- src/org/traccar/api/resource/AttributeAliasResource.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/org/traccar/api') diff --git a/src/org/traccar/api/resource/AttributeAliasResource.java b/src/org/traccar/api/resource/AttributeAliasResource.java index 827b50c38..6dbcf6ce8 100644 --- a/src/org/traccar/api/resource/AttributeAliasResource.java +++ b/src/org/traccar/api/resource/AttributeAliasResource.java @@ -46,9 +46,9 @@ public class AttributeAliasResource extends BaseResource { if (!Context.getPermissionsManager().isAdmin(getUserId())) { Context.getPermissionsManager().checkDevice(getUserId(), deviceId); } - return Context.getAliasesManager().getDeviceAttributeAliases(deviceId); + return Context.getAliasesManager().getAttributeAliases(deviceId); } else { - return Context.getAliasesManager().getUserDevicesAttributeAliases(getUserId()); + return Context.getAliasesManager().getAllAttributeAliases(getUserId()); } } @@ -67,10 +67,8 @@ public class AttributeAliasResource extends BaseResource { public Response update(@PathParam("id") long id, AttributeAlias entity) throws SQLException { Context.getPermissionsManager().checkReadonly(getUserId()); if (!Context.getPermissionsManager().isAdmin(getUserId())) { - AttributeAlias oldAttrbuteAlias = Context.getAliasesManager().getAttributeAliasById(entity.getId()); - if (oldAttrbuteAlias != null && oldAttrbuteAlias.getDeviceId() != entity.getDeviceId()) { - Context.getPermissionsManager().checkDevice(getUserId(), oldAttrbuteAlias.getDeviceId()); - } + AttributeAlias oldEntity = Context.getAliasesManager().getAttributeAlias(entity.getId()); + Context.getPermissionsManager().checkDevice(getUserId(), oldEntity.getDeviceId()); Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId()); } Context.getAliasesManager().updateAttributeAlias(entity); @@ -82,9 +80,8 @@ public class AttributeAliasResource extends BaseResource { public Response remove(@PathParam("id") long id) throws SQLException { Context.getPermissionsManager().checkReadonly(getUserId()); if (!Context.getPermissionsManager().isAdmin(getUserId())) { - AttributeAlias attrbuteAlias = Context.getAliasesManager().getAttributeAliasById(id); - Context.getPermissionsManager().checkDevice(getUserId(), - attrbuteAlias != null ? attrbuteAlias.getDeviceId() : 0); + AttributeAlias entity = Context.getAliasesManager().getAttributeAlias(id); + Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId()); } Context.getAliasesManager().removeArrtibuteAlias(id); return Response.noContent().build(); -- cgit v1.2.3