Merge pull request #342 from hashmapinc/Tempus-336

Tempus 336
hashmapinc · May 16, 2018 · a9ca244 · a9ca244
2 parents b25ddeb + 8618f80
commit a9ca244
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/ui/src/app/device/device.controller.js b/ui/src/app/device/device.controller.js
@@ -368,8 +368,14 @@ export function DeviceController($rootScope,userService, deviceService, customer
 
 
                 if ($scope.query.search != null) {
-                    deviceSortList = $filter('filter')(items.data, {name: $scope.query.search});
 
+                    deviceSortList = $filter('filter')(items.data, function(data) {
+                        if ($scope.query.search) {
+                            return data.name.toLowerCase().indexOf($scope.query.search.toLowerCase()) > -1 || data.type.toLowerCase().indexOf($scope.query.search.toLowerCase()) > -1;
+                        } else {
+                            return true;
+                        }
+                    });
                 }
 
                 var startIndex = $scope.query.limit * ($scope.query.page - 1);

diff --git a/ui/src/app/device/devices.tpl.html b/ui/src/app/device/devices.tpl.html
@@ -75,11 +75,11 @@
         <thead md-head md-order="query.order" md-on-reorder="onReorder">
         <tr md-row>
             <th md-column md-order-by="name"><span translate>Name</span></th>
-            <th md-column md-order-by="name"><span translate>Type</span></th>
-            <th md-column md-order-by="createdTime"><span translate>Description</span></th>
-            <th md-column md-order-by="createdTime"><span translate>Status</span></th>
+            <th md-column md-order-by="type"><span translate>Type</span></th>
+            <th md-column><span translate>Description</span></th>
+            <th md-column><span translate>Status</span></th>
             <th md-column><span translate>Age</span></th>
-            <th md-column md-order-by="createdTime"><span translate>Last Time Received</span></th>
+            <th md-column><span translate>Last Time Received</span></th>
 
         </tr>
         </thead>