Merge from upstream, change .eslintrc.json

1 files changed, 10 insertions, 0 deletions

diff --git a/web/app/Application.js b/web/app/Application.js
index c14dd4d3..e0f0aa45 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -83,10 +83,12 @@ Ext.define('Traccar.Application', {
         'AllTimezones',
         'VisibleDevices',
         'DeviceStatuses',
+        'CommonDeviceAttributes',
         'DeviceAttributes',
         'GeofenceAttributes',
         'GroupAttributes',
         'ServerAttributes',
+        'CommonUserAttributes',
         'UserAttributes',
         'ComputedAttributes',
         'AllComputedAttributes',
@@ -104,6 +106,10 @@ Ext.define('Traccar.Application', {
         return window.matchMedia && window.matchMedia('(max-width: 768px)').matches;
     },
 
+    getVehicleFeaturesDisabled: function () {
+        return this.getBooleanAttributePreference('ui.disableVehicleFetures');
+    },
+
     getEventString: function (eventType) {
         var key = 'event' + eventType.charAt(0).toUpperCase() + eventType.slice(1);
         return Strings[key] || key;
@@ -161,6 +167,10 @@ Ext.define('Traccar.Application', {
         }
     },
 
+    getBooleanAttributePreference: function (key) {
+        return this.getAttributePreference(key, false).toString() === 'true';
+    },
+
     getReportColor: function (deviceId) {
         var index, reportColor, device = Ext.getStore('Devices').getById(deviceId);
         if (device) {