From a7bfd5431b73b5d634b769e64483e81815364bca Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 28 Jul 2017 08:58:54 +0500 Subject: Do not show geofenceId if it is unknown --- web/app/view/edit/Devices.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/app/view/edit/Devices.js') diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js index d5e6d5f4..eda8bbde 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; -- cgit v1.2.3 From d15a49e82481381a571c0c2285edd2fc77ccb5ca Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 28 Jul 2017 09:29:46 +0500 Subject: Unwrap ternary operator --- web/app/view/edit/Devices.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'web/app/view/edit/Devices.js') diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js index eda8bbde..c9538c8b 100644 --- a/web/app/view/edit/Devices.js +++ b/web/app/view/edit/Devices.js @@ -164,7 +164,9 @@ Ext.define('Traccar.view.edit.Devices', { if (Ext.isArray(value)) { for (i = 0; i < value.length; i++) { name = Traccar.AttributeFormatter.geofenceIdFormatter(value[i]); - result += name ? name + ((i < value.length - 1) ? ', ' : '') : ''; + if (name) { + result += name + ((i < value.length - 1) ? ', ' : ''); + } } } return result; -- cgit v1.2.3