Merge pull request #634 from Abyss777/disable_device

Implement disabling devices

2 files changed, 13 insertions, 4 deletions

diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js
index 39550b6c..2f7f80ee 100644
--- a/web/app/view/edit/Devices.js
+++ b/web/app/view/edit/Devices.js
@@ -81,11 +81,14 @@ Ext.define('Traccar.view.edit.Devices', {
     viewConfig: {
         enableTextSelection: true,
         getRowClass: function (record) {
-            var status = record.get('status');
+            var result = '', status = record.get('status');
+            if (record.get('disabled')) {
+                result = 'view-item-disabled ';
+            }
             if (status) {
-                return Ext.getStore('DeviceStatuses').getById(status).get('color');
+                result += Ext.getStore('DeviceStatuses').getById(status).get('color');
             }
-            return null;
+            return result;
         }
     },
 
@@ -125,6 +128,12 @@ Ext.define('Traccar.view.edit.Devices', {
             },
             renderer: Traccar.AttributeFormatter.getFormatter('groupId')
         }, {
+            text: Strings.sharedDisabled,
+            dataIndex: 'disabled',
+            renderer: Traccar.AttributeFormatter.getFormatter('disabled'),
+            hidden: true,
+            filter: 'boolean'
+        }, {
             text: Strings.sharedGeofences,
             dataIndex: 'geofenceIds',
             hidden: true,
diff --git a/web/app/view/edit/Users.js b/web/app/view/edit/Users.js
index fd371990..b0a67ffd 100644
--- a/web/app/view/edit/Users.js
+++ b/web/app/view/edit/Users.js
@@ -133,7 +133,7 @@ Ext.define('Traccar.view.edit.Users', {
             hidden: true,
             filter: 'boolean'
         }, {
-            text: Strings.userDisabled,
+            text: Strings.sharedDisabled,
             dataIndex: 'disabled',
             renderer: Traccar.AttributeFormatter.getFormatter('disabled'),
             filter: 'boolean'