Combine permission resources and reuse common database functions

1 files changed, 5 insertions, 1 deletions

diff --git a/src/org/traccar/api/resource/UserResource.java b/src/org/traccar/api/resource/UserResource.java
index b9187fdbb..94cc56b47 100644
--- a/src/org/traccar/api/resource/UserResource.java
+++ b/src/org/traccar/api/resource/UserResource.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Date;
+import java.util.LinkedHashMap;
 
 @Path("users")
 @Produces(MediaType.APPLICATION_JSON)
@@ -74,7 +75,10 @@ public class UserResource extends BaseResource {
         }
         Context.getPermissionsManager().addUser(entity);
         if (Context.getPermissionsManager().isManager(getUserId())) {
-            Context.getDataManager().linkUser(getUserId(), entity.getId());
+            LinkedHashMap<String, Long> link = new LinkedHashMap<>();
+            link.put("userId", getUserId());
+            link.put("managedUserId", entity.getId());
+            Context.getDataManager().linkObject(link, true);
         }
         Context.getPermissionsManager().refreshUserPermissions();
         if (Context.getNotificationManager() != null) {