Merge remote-tracking branch 'refs/remotes/tananaev/master'

1 files changed, 8 insertions, 1 deletions

diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js
index c42af95d0..4a22ca008 100644
--- a/web/app/view/DeviceDialog.js
+++ b/web/app/view/DeviceDialog.js
@@ -29,13 +29,20 @@ Ext.define('Traccar.view.DeviceDialog', {
         items: [{
             xtype: 'textfield',
             name: 'name',
-            fieldLabel: Strings.deviceName,
+            fieldLabel: Strings.sharedName,
             allowBlank: false
         }, {
             xtype: 'textfield',
             name: 'uniqueId',
             fieldLabel: Strings.deviceIdentifier,
             allowBlank: false
+        }, {
+            xtype: 'combobox',
+            name: 'groupId',
+            fieldLabel: Strings.groupParent,
+            store: 'Groups',
+            displayField: 'name',
+            valueField: 'id'
         }]
     }
 });