- Remove search string

- Rename functions and variables
- Fix device deselect
- Fix appearing features and double visibility check

1 files changed, 7 insertions, 8 deletions

diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index 84ed800d..eee214ee 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -96,12 +96,7 @@ Ext.define('Traccar.view.Devices', {
         items: [{
             text: Strings.sharedName,
             dataIndex: 'name',
-            filter: {
-                type: 'string',
-                itemDefaults: {
-                    emptyText: Strings.deviceSearchFor
-                }
-            }
+            filter: 'string'
         }, {
             text: Strings.deviceIdentifier,
             dataIndex: 'uniqueId',
@@ -156,9 +151,13 @@ Ext.define('Traccar.view.Devices', {
                 store: 'DeviceStatuses'
             },
             renderer: function (value, metaData) {
+                var status;
                 if (value) {
-                    metaData.tdCls = Ext.getStore('DeviceStatuses').getById(value).get('tdCls');
-                    return Ext.getStore('DeviceStatuses').getById(value).get('name');
+                    status = Ext.getStore('DeviceStatuses').getById(value);
+                    if (status) {
+                        metaData.tdCls = status.get('color');
+                        return status.get('name');
+                    }
                 }
             }
         }]