1 files changed, 30 insertions, 1 deletions
diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index ebe3ca195..b464ed561 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -62,6 +62,31 @@ Ext.define('Traccar.view.Devices', {
         }]
     },
 
+    bbar: [{
+        xtype: 'tbtext',
+        html: Strings.sharedSearch
+    }, {
+        xtype: 'textfield',
+        listeners: {
+            change: function () {
+                var tree, expr;
+                tree = this.up('treepanel');
+                expr = new RegExp(this.getValue(), 'i');
+                tree.store.filter({
+                    id: 'nameFilter',
+                    filterFn: function (node) {
+                        var children, len, visible, i;
+                        children = node.childNodes;
+                        len = children && children.length;
+                        visible = node.isLeaf() ? expr.test(node.get('name')) : false;
+                        for (i = 0; i < len && !(visible = children[i].get('visible')); i++);
+                        return visible;
+                    }
+                });
+            }
+        }
+    }],
+
     listeners: {
         selectionchange: 'onSelectionChange',
         beforeselect: 'onBeforeSelect'
@@ -89,7 +114,11 @@ Ext.define('Traccar.view.Devices', {
                         metaData.tdCls = 'status-color-unknown';
                         break;
                 }
-                return Ext.Date.format(value, Traccar.Style.dateTimeFormat);
+                if (Traccar.app.getPreference('twelveHourFormat', false)) {
+                    return Ext.Date.format(value, Traccar.Style.dateTimeFormat12);
+                } else {
+                    return Ext.Date.format(value, Traccar.Style.dateTimeFormat24);
+                }
             }
         }
     }]