aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-07-28 08:58:54 +0500
committerAbyss777 <abyss@fox5.ru>2017-07-28 08:58:54 +0500
commita7bfd5431b73b5d634b769e64483e81815364bca (patch)
treefb5d5f35d0c7fc3510f02137def18a27be4d23e4
parent352159c53b862a78cead3c1447d14eca28bd9c58 (diff)
downloadetbsa-traccar-web-a7bfd5431b73b5d634b769e64483e81815364bca.tar.gz
etbsa-traccar-web-a7bfd5431b73b5d634b769e64483e81815364bca.tar.bz2
etbsa-traccar-web-a7bfd5431b73b5d634b769e64483e81815364bca.zip
Do not show geofenceId if it is unknown
-rw-r--r--web/app/AttributeFormatter.js2
-rw-r--r--web/app/view/dialog/SelectDeviceController.js2
-rw-r--r--web/app/view/edit/Devices.js6
-rw-r--r--web/app/view/map/MapMarkerController.js7
4 files changed, 9 insertions, 8 deletions
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 47a924a..2d394f5 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 9ed5e21..9437991 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 d5e6d5f..eda8bbd 100644
--- a/web/app/view/edit/Devices.js
+++ b/web/app/view/edit/Devices.js
@@ -160,11 +160,11 @@ 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]);
+ result += name ? name + ((i < value.length - 1) ? ', ' : '') : '';
}
}
return result;
diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js
index 2f1d91e..df4029d 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);
}