Merge pull request #537 from Abyss777/hide_geofences

Do not show geofenceId if it is unknown

4 files changed, 11 insertions, 8 deletions

diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 47a924a7..2d394f57 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -82,7 +82,7 @@ Ext.define('Traccar.AttributeFormatter', {
                 store = Ext.getStore('Geofences');
             }
             geofence = store.getById(value);
-            return geofence ? geofence.get('name') : value;
+            return geofence ? geofence.get('name') : '';
         }
     },
 
diff --git a/web/app/view/dialog/SelectDeviceController.js b/web/app/view/dialog/SelectDeviceController.js
index 9ed5e217..9437991c 100644
--- a/web/app/view/dialog/SelectDeviceController.js
+++ b/web/app/view/dialog/SelectDeviceController.js
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.dialog.SelectDeviceController', {
         deviceId = this.lookupReference('deviceField').getValue();
         record = this.getView().record.data;
         Ext.Ajax.request({
-            url: 'api/attributes/computed?deviceId=' + deviceId,
+            url: 'api/attributes/computed/test?deviceId=' + deviceId,
             method: 'POST',
             jsonData: Ext.util.JSON.encode(record),
             callback: function (options, success, response) {
diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js
index d5e6d5f4..c9538c8b 100644
--- a/web/app/view/edit/Devices.js
+++ b/web/app/view/edit/Devices.js
@@ -160,11 +160,13 @@ Ext.define('Traccar.view.edit.Devices', {
                 store: 'Geofences'
             },
             renderer: function (value) {
-                var i, result = '';
+                var i, name, result = '';
                 if (Ext.isArray(value)) {
                     for (i = 0; i < value.length; i++) {
-                        result += Traccar.AttributeFormatter.geofenceIdFormatter(value[i]);
-                        result += (i < value.length - 1) ? ', ' : '';
+                        name = Traccar.AttributeFormatter.geofenceIdFormatter(value[i]);
+                        if (name) {
+                            result += name + ((i < value.length - 1) ? ', ' : '');
+                        }
                     }
                 }
                 return result;
diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js
index 2f1d91e1..df4029d2 100644
--- a/web/app/view/map/MapMarkerController.js
+++ b/web/app/view/map/MapMarkerController.js
@@ -495,11 +495,12 @@ Ext.define('Traccar.view.map.MapMarkerController', {
     },
 
     selectEvent: function (position) {
+        var marker;
         this.fireEvent('deselectfeature');
         if (position) {
-            var maker = this.addReportMarker(position);
-            maker.set('event', true);
-            this.selectMarker(maker, true);
+            marker = this.addReportMarker(position);
+            marker.set('event', true);
+            this.selectMarker(marker, true);
         } else if (this.selectedMarker && this.selectedMarker.get('event')) {
             this.selectMarker(null, false);
         }