From 8bf5fd13490ef4b288315e507d8554d7aa356b23 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 23 Apr 2023 07:57:34 -0700 Subject: Remove geofence ids --- web/app/controller/Root.js | 3 +-- web/app/model/Device.js | 2 -- web/app/view/edit/Devices.js | 22 ---------------------- 3 files changed, 1 insertion(+), 26 deletions(-) (limited to 'web/app') diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index a37bc06f..22869f45 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -298,8 +298,7 @@ Ext.define('Traccar.controller.Root', { if (entity) { entity.set({ status: array[i].status, - lastUpdate: array[i].lastUpdate, - geofenceIds: array[i].geofenceIds + lastUpdate: array[i].lastUpdate }, { dirty: false }); diff --git a/web/app/model/Device.js b/web/app/model/Device.js index df6b09be..ca1e07a6 100644 --- a/web/app/model/Device.js +++ b/web/app/model/Device.js @@ -58,8 +58,6 @@ Ext.define('Traccar.model.Device', { }, { name: 'disabled', type: 'boolean' - }, { - name: 'geofenceIds' }, { name: 'attributes' }] diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js index 21fdb32a..5f54202a 100644 --- a/web/app/view/edit/Devices.js +++ b/web/app/view/edit/Devices.js @@ -134,28 +134,6 @@ Ext.define('Traccar.view.edit.Devices', { renderer: Traccar.AttributeFormatter.getFormatter('disabled'), hidden: true, filter: 'boolean' - }, { - text: Strings.sharedGeofences, - dataIndex: 'geofenceIds', - hidden: true, - filter: { - type: 'arraylist', - idField: 'id', - labelField: 'name', - store: 'Geofences' - }, - renderer: function (value) { - var i, name, result = ''; - if (Ext.isArray(value)) { - for (i = 0; i < value.length; i++) { - name = Traccar.AttributeFormatter.geofenceIdFormatter(value[i]); - if (name) { - result += name + (i < value.length - 1 ? ', ' : ''); - } - } - } - return result; - } }, { text: Strings.deviceStatus, dataIndex: 'status', -- cgit v1.2.3