diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-28 16:32:34 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-28 16:32:33 +1200 |
commit | a2e350b15065bf9922631944daa95790b7a869a8 (patch) | |
tree | 604d904829d2069d6d0ba900d23d08a54123a8c5 /web/app/view/edit | |
parent | 352159c53b862a78cead3c1447d14eca28bd9c58 (diff) | |
parent | d15a49e82481381a571c0c2285edd2fc77ccb5ca (diff) | |
download | trackermap-web-a2e350b15065bf9922631944daa95790b7a869a8.tar.gz trackermap-web-a2e350b15065bf9922631944daa95790b7a869a8.tar.bz2 trackermap-web-a2e350b15065bf9922631944daa95790b7a869a8.zip |
Merge pull request #537 from Abyss777/hide_geofences
Do not show geofenceId if it is unknown
Diffstat (limited to 'web/app/view/edit')
-rw-r--r-- | web/app/view/edit/Devices.js | 8 |
1 files changed, 5 insertions, 3 deletions
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; |