1 files changed, 15 insertions, 1 deletions
diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index 3dd81eb05..ae46ba080 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -29,13 +29,27 @@ Ext.define('Traccar.view.Devices', {
 
     initComponent: function() {
         this.store = Ext.create('Ext.data.ChainedStore', {
-            source: 'Devices'
+            source: 'Devices',
+            groupField: 'groupId'
         });
         this.callParent();
     },
 
     title: Strings.deviceTitle,
     selType: 'rowmodel',
+    features: [{
+        ftype: 'grouping',
+        groupHeaderTpl: Ext.create('Ext.XTemplate', '{name:this.getGroupName}', {
+            getGroupName: function (v) {
+                var groupId = Number(v);
+                if (groupId) {
+                    return Ext.getStore('Groups').getById(groupId).get('name');
+                } else {
+                    return Strings.groupNoGroup;
+                }
+            }
+        })
+    }],
 
     tbar: {
         xtype: 'editToolbar',