2 files changed, 1 insertions, 59 deletions

diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index d1d799944..70e11aab5 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -26,16 +26,7 @@ Ext.define('Traccar.view.Devices', {
 
     controller: 'devices',
     rootVisible: false,
-    store: {
-        type: 'tree',
-        parentIdProperty: 'groupId',
-        proxy: {
-            type: 'memory',
-            reader: {
-                type: 'json'
-            }
-        }
-    },
+    store: 'DevicesTree',
 
     title: Strings.deviceTitle,
     selType: 'rowmodel',
diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index d45fd50a8..864e3f2aa 100644
--- a/web/app/view/DevicesController.js
+++ b/web/app/view/DevicesController.js
@@ -30,59 +30,10 @@ Ext.define('Traccar.view.DevicesController', {
                     selectDevice: 'selectDevice',
                     selectReport: 'selectReport'
                 }
-            },
-            store: {
-                '#Groups': {
-                    datachanged: 'storeUpdate',
-                    update: 'storeUpdate'
-                },
-                '#Devices': {
-                    datachanged: 'storeUpdate',
-                    update: 'storeUpdate'
-                }
             }
         }
     },
 
-    storeUpdate: function () {
-        var groupsStore, devicesStore, nodes = [];
-        groupsStore = Ext.getStore('Groups');
-        devicesStore = Ext.getStore('Devices');
-
-        groupsStore.each(function (record) {
-            var groupId, node = {
-                id: 'g' + record.get('id'),
-                original: record,
-                name: record.get('name'),
-                leaf: true
-            };
-            groupId = record.get('groupId');
-            if (groupId !== 0 && groupsStore.indexOfId(groupId) !== -1) {
-                node.groupId = 'g' + groupId;
-            }
-            nodes.push(node);
-        }, this);
-        devicesStore.each(function (record) {
-            var groupId, node = {
-                id: 'd' + record.get('id'),
-                original: record,
-                name: record.get('name'),
-                status: record.get('status'),
-                lastUpdate: record.get('lastUpdate'),
-                leaf: true
-            };
-            groupId = record.get('groupId');
-            if (groupId !== 0 && groupsStore.indexOfId(groupId) !== -1) {
-                node.groupId = 'g' + groupId;
-            }
-            nodes.push(node);
-        }, this);
-
-        this.getView().getStore().getProxy().setData(nodes);
-        this.getView().getStore().load();
-        this.getView().expandAll();
-    },
-
     init: function () {
         var readonly = Traccar.app.getServer().get('readonly') && !Traccar.app.getUser().get('admin');
         this.lookupReference('toolbarAddButton').setVisible(!readonly);