Fixed duplicated devices loading for 'manager' user

vitalidze · Apr 27, 2015 · 1e881ec · 1e881ec
1 parent dc85c7e
commit 1e881ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/traccar/web/server/model/DataServiceImpl.java b/src/main/java/org/traccar/web/server/model/DataServiceImpl.java
@@ -301,7 +301,7 @@ public List<Device> getDevices() {
         if (user.getAdmin()) {
             return getSessionEntityManager().createQuery("SELECT x FROM Device x LEFT JOIN FETCH x.latestPosition").getResultList();
         }
-        return user.getAllAvailableDevices();
+        return new LinkedList<Device>(user.getAllAvailableDevices());
     }
 
     @Transactional

diff --git a/src/main/java/org/traccar/web/shared/model/User.java b/src/main/java/org/traccar/web/shared/model/User.java
@@ -146,8 +146,8 @@ public List<Device> getDevices() {
         return devices;
     }
 
-    public List<Device> getAllAvailableDevices() {
-        List<Device> devices = new LinkedList<Device>();
+    public Set<Device> getAllAvailableDevices() {
+        Set<Device> devices = new HashSet<Device>();
         devices.addAll(getDevices());
         if (getManager()) {
             for (User managedUser : getManagedUsers()) {